Skip to content

Commit

Permalink
Xtext Jenkins no longer works
Browse files Browse the repository at this point in the history 
https://gitlab.eclipse.org/eclipsefdn/helpdesk/-/issues/5362
  • Loading branch information
@fredg02
fredg02 committed Nov 29, 2024
1 parent adee1f1 commit d87217d
Show file tree
Hide file tree
Showing 4 changed files with 62 additions and 61 deletions.
4 changes: 2 additions & 2 deletions instances/modeling.tmf.xtext/config.jsonnet
View file
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
local currentCloud = self,
templates+: {
"ubuntu-2404-6gb": currentCloud.templates["ubuntu-2404"] {
labels: ["centos-7-6gb"],
labels: ["centos-7-6gb", "centos-8-6gb"],
kubernetes+: {
resources+: {
memory: {
Expand All @@ -38,7 +38,7 @@
},
},
},
"ubuntu-2404-6gb1": currentCloud.templates["ubuntu-2404"] {
"centos-8-6gb": currentCloud.templates["ubuntu-2404"] {
labels: ["centos-8-6gb"],
kubernetes+: {
resources+: {
Expand Down
55 changes: 28 additions & 27 deletions instances/modeling.tmf.xtext/target/config.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -124,14 +124,14 @@
"startupScript": "/usr/local/bin/jenkins-agent",
"username": "jenkins"
},
"ubuntu-2204": {
"centos-8-6gb": {
"agentWorkdir": "/home/jenkins/jenkins-agent",
"docker": {
"aliases": [ ],
"build_args": "['FROM_TAG': '22.04']",
"build_args": "['FROM_TAG': '24.04']",
"context": "ubuntu",
"dockerfile": "#*******************************************************************************\n# Copyright (c) 2020 Eclipse Foundation and others.\n# This program and the accompanying materials are made available\n# under the terms of the Eclipse Public License 2.0\n# which is available at http://www.eclipse.org/legal/epl-v20.html,\n# or the MIT License which is available at https://opensource.org/licenses/MIT.\n# SPDX-License-Identifier: EPL-2.0 OR MIT\n#*******************************************************************************\nFROM docker.io/eclipsecbi/jiro-agent-ubuntu-2204:spec\n\n# These environment variables will be used in the uid_entrypoint script from the parent image\nENV USER_NAME=\"jenkins\"\nENV HOME=\"/home/jenkins\"\n\nVOLUME [ \"/home/jenkins\" ]\nWORKDIR \"/home/jenkins\"\nENTRYPOINT [ \"/usr/local/bin/jenkins-agent\" ]\n\nADD \"https://repo.jenkins-ci.org/public/org/jenkins-ci/main/remoting/3261.v9c670a_4748a_9/remoting-3261.v9c670a_4748a_9.jar\" \"/usr/share/jenkins/agent.jar\"\nADD \"https://github.com/jenkinsci/docker-agent/raw/3261.v9c670a_4748a_9-8/jenkins-agent\" \"/usr/local/bin/jenkins-agent\"\n\nRUN sed -e 's/JAVA_OPTS/JAVA_OPTS \\$JENKINS_REMOTING_JAVA_OPTS/g' /usr/local/bin/jenkins-agent > /usr/local/bin/jenkins-agent.sed \\\n && mv /usr/local/bin/jenkins-agent.sed /usr/local/bin/jenkins-agent\n\nRUN chmod 755 \"$(dirname \"/usr/share/jenkins/agent.jar\")\" \\\n && chmod 644 \"/usr/share/jenkins/agent.jar\" \\\n && chmod ug+rx \"/usr/local/bin/jenkins-agent\" \\\n && chgrp 0 \"/usr/local/bin/jenkins-agent\"\n\nRUN ln -sf /bin/bash /bin/sh\n\nUSER 10001:0\n\n",
"image": "jiro-agent-ubuntu-2204",
"dockerfile": "#*******************************************************************************\n# Copyright (c) 2020 Eclipse Foundation and others.\n# This program and the accompanying materials are made available\n# under the terms of the Eclipse Public License 2.0\n# which is available at http://www.eclipse.org/legal/epl-v20.html,\n# or the MIT License which is available at https://opensource.org/licenses/MIT.\n# SPDX-License-Identifier: EPL-2.0 OR MIT\n#*******************************************************************************\nFROM docker.io/eclipsecbi/jiro-agent-ubuntu-2404:spec\n\n# These environment variables will be used in the uid_entrypoint script from the parent image\nENV USER_NAME=\"jenkins\"\nENV HOME=\"/home/jenkins\"\n\nVOLUME [ \"/home/jenkins\" ]\nWORKDIR \"/home/jenkins\"\nENTRYPOINT [ \"/usr/local/bin/jenkins-agent\" ]\n\nADD \"https://repo.jenkins-ci.org/public/org/jenkins-ci/main/remoting/3261.v9c670a_4748a_9/remoting-3261.v9c670a_4748a_9.jar\" \"/usr/share/jenkins/agent.jar\"\nADD \"https://github.com/jenkinsci/docker-agent/raw/3261.v9c670a_4748a_9-8/jenkins-agent\" \"/usr/local/bin/jenkins-agent\"\n\nRUN sed -e 's/JAVA_OPTS/JAVA_OPTS \\$JENKINS_REMOTING_JAVA_OPTS/g' /usr/local/bin/jenkins-agent > /usr/local/bin/jenkins-agent.sed \\\n && mv /usr/local/bin/jenkins-agent.sed /usr/local/bin/jenkins-agent\n\nRUN chmod 755 \"$(dirname \"/usr/share/jenkins/agent.jar\")\" \\\n && chmod 644 \"/usr/share/jenkins/agent.jar\" \\\n && chmod ug+rx \"/usr/local/bin/jenkins-agent\" \\\n && chgrp 0 \"/usr/local/bin/jenkins-agent\"\n\nRUN ln -sf /bin/bash /bin/sh\n\nUSER 10001:0\n\n",
"image": "jiro-agent-ubuntu-2404",
"registry": "docker.io",
"repository": "eclipsecbi",
"tag": "remoting-3261.v9c670a_4748a_9"
Expand All @@ -141,7 +141,7 @@
"JENKINS_REMOTING_JAVA_OPTS": [
"-showversion",
"-XshowSettings:vm",
"-Xmx256m",
"-Xmx512m",
"-Dorg.jenkinsci.remoting.engine.JnlpProtocol3.disabled=true",
"-Dorg.jenkinsci.plugins.gitclient.CliGitAPIImpl.useSETSID=true"
],
Expand All @@ -161,8 +161,8 @@
"request": "1000m"
},
"memory": {
"limit": "4096Mi",
"request": "4096Mi"
"limit": "6144Mi",
"request": "6144Mi"
}
},
"volumes": [
Expand Down Expand Up @@ -214,11 +214,11 @@
"yamlMergeStrategy": "merge"
},
"labels": [
"ubuntu-2204"
"centos-8-6gb"
],
"maxHeap": "256m",
"mode": "EXCLUSIVE",
"name": "ubuntu-2204",
"name": "ubuntu-2404",
"remoting": {
"jar": "/usr/share/jenkins/agent.jar",
"startupScript": {
Expand All @@ -232,14 +232,14 @@
"startupScript": "/usr/local/bin/jenkins-agent",
"username": "jenkins"
},
"ubuntu-2404": {
"ubuntu-2204": {
"agentWorkdir": "/home/jenkins/jenkins-agent",
"docker": {
"aliases": [ ],
"build_args": "['FROM_TAG': '24.04']",
"build_args": "['FROM_TAG': '22.04']",
"context": "ubuntu",
"dockerfile": "#*******************************************************************************\n# Copyright (c) 2020 Eclipse Foundation and others.\n# This program and the accompanying materials are made available\n# under the terms of the Eclipse Public License 2.0\n# which is available at http://www.eclipse.org/legal/epl-v20.html,\n# or the MIT License which is available at https://opensource.org/licenses/MIT.\n# SPDX-License-Identifier: EPL-2.0 OR MIT\n#*******************************************************************************\nFROM docker.io/eclipsecbi/jiro-agent-ubuntu-2404:spec\n\n# These environment variables will be used in the uid_entrypoint script from the parent image\nENV USER_NAME=\"jenkins\"\nENV HOME=\"/home/jenkins\"\n\nVOLUME [ \"/home/jenkins\" ]\nWORKDIR \"/home/jenkins\"\nENTRYPOINT [ \"/usr/local/bin/jenkins-agent\" ]\n\nADD \"https://repo.jenkins-ci.org/public/org/jenkins-ci/main/remoting/3261.v9c670a_4748a_9/remoting-3261.v9c670a_4748a_9.jar\" \"/usr/share/jenkins/agent.jar\"\nADD \"https://github.com/jenkinsci/docker-agent/raw/3261.v9c670a_4748a_9-8/jenkins-agent\" \"/usr/local/bin/jenkins-agent\"\n\nRUN sed -e 's/JAVA_OPTS/JAVA_OPTS \\$JENKINS_REMOTING_JAVA_OPTS/g' /usr/local/bin/jenkins-agent > /usr/local/bin/jenkins-agent.sed \\\n && mv /usr/local/bin/jenkins-agent.sed /usr/local/bin/jenkins-agent\n\nRUN chmod 755 \"$(dirname \"/usr/share/jenkins/agent.jar\")\" \\\n && chmod 644 \"/usr/share/jenkins/agent.jar\" \\\n && chmod ug+rx \"/usr/local/bin/jenkins-agent\" \\\n && chgrp 0 \"/usr/local/bin/jenkins-agent\"\n\nRUN ln -sf /bin/bash /bin/sh\n\nUSER 10001:0\n\n",
"image": "jiro-agent-ubuntu-2404",
"dockerfile": "#*******************************************************************************\n# Copyright (c) 2020 Eclipse Foundation and others.\n# This program and the accompanying materials are made available\n# under the terms of the Eclipse Public License 2.0\n# which is available at http://www.eclipse.org/legal/epl-v20.html,\n# or the MIT License which is available at https://opensource.org/licenses/MIT.\n# SPDX-License-Identifier: EPL-2.0 OR MIT\n#*******************************************************************************\nFROM docker.io/eclipsecbi/jiro-agent-ubuntu-2204:spec\n\n# These environment variables will be used in the uid_entrypoint script from the parent image\nENV USER_NAME=\"jenkins\"\nENV HOME=\"/home/jenkins\"\n\nVOLUME [ \"/home/jenkins\" ]\nWORKDIR \"/home/jenkins\"\nENTRYPOINT [ \"/usr/local/bin/jenkins-agent\" ]\n\nADD \"https://repo.jenkins-ci.org/public/org/jenkins-ci/main/remoting/3261.v9c670a_4748a_9/remoting-3261.v9c670a_4748a_9.jar\" \"/usr/share/jenkins/agent.jar\"\nADD \"https://github.com/jenkinsci/docker-agent/raw/3261.v9c670a_4748a_9-8/jenkins-agent\" \"/usr/local/bin/jenkins-agent\"\n\nRUN sed -e 's/JAVA_OPTS/JAVA_OPTS \\$JENKINS_REMOTING_JAVA_OPTS/g' /usr/local/bin/jenkins-agent > /usr/local/bin/jenkins-agent.sed \\\n && mv /usr/local/bin/jenkins-agent.sed /usr/local/bin/jenkins-agent\n\nRUN chmod 755 \"$(dirname \"/usr/share/jenkins/agent.jar\")\" \\\n && chmod 644 \"/usr/share/jenkins/agent.jar\" \\\n && chmod ug+rx \"/usr/local/bin/jenkins-agent\" \\\n && chgrp 0 \"/usr/local/bin/jenkins-agent\"\n\nRUN ln -sf /bin/bash /bin/sh\n\nUSER 10001:0\n\n",
"image": "jiro-agent-ubuntu-2204",
"registry": "docker.io",
"repository": "eclipsecbi",
"tag": "remoting-3261.v9c670a_4748a_9"
Expand Down Expand Up @@ -322,17 +322,11 @@
"yamlMergeStrategy": "merge"
},
"labels": [
"ubuntu-latest",
"ubuntu-2404",
"migration",
"jipp-migration",
"centos-7",
"centos-8",
"centos-latest"
"ubuntu-2204"
],
"maxHeap": "256m",
"mode": "EXCLUSIVE",
"name": "ubuntu-2404",
"name": "ubuntu-2204",
"remoting": {
"jar": "/usr/share/jenkins/agent.jar",
"startupScript": {
Expand All @@ -346,7 +340,7 @@
"startupScript": "/usr/local/bin/jenkins-agent",
"username": "jenkins"
},
"ubuntu-2404-6gb": {
"ubuntu-2404": {
"agentWorkdir": "/home/jenkins/jenkins-agent",
"docker": {
"aliases": [ ],
Expand Down Expand Up @@ -383,8 +377,8 @@
"request": "1000m"
},
"memory": {
"limit": "6144Mi",
"request": "6144Mi"
"limit": "4096Mi",
"request": "4096Mi"
}
},
"volumes": [
Expand Down Expand Up @@ -436,7 +430,13 @@
"yamlMergeStrategy": "merge"
},
"labels": [
"centos-7-6gb"
"ubuntu-latest",
"ubuntu-2404",
"migration",
"jipp-migration",
"centos-7",
"centos-8",
"centos-latest"
],
"maxHeap": "256m",
"mode": "EXCLUSIVE",
Expand All @@ -454,7 +454,7 @@
"startupScript": "/usr/local/bin/jenkins-agent",
"username": "jenkins"
},
"ubuntu-2404-6gb1": {
"ubuntu-2404-6gb": {
"agentWorkdir": "/home/jenkins/jenkins-agent",
"docker": {
"aliases": [ ],
Expand All @@ -471,7 +471,7 @@
"JENKINS_REMOTING_JAVA_OPTS": [
"-showversion",
"-XshowSettings:vm",
"-Xmx512m",
"-Xmx256m",
"-Dorg.jenkinsci.remoting.engine.JnlpProtocol3.disabled=true",
"-Dorg.jenkinsci.plugins.gitclient.CliGitAPIImpl.useSETSID=true"
],
Expand Down Expand Up @@ -544,6 +544,7 @@
"yamlMergeStrategy": "merge"
},
"labels": [
"centos-7-6gb",
"centos-8-6gb"
],
"maxHeap": "256m",
Expand Down
32 changes: 16 additions & 16 deletions instances/modeling.tmf.xtext/target/jenkins/configuration.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -190,12 +190,12 @@ jenkins:
secretName: gradle-secret-dir
inheritYamlMergeStrategy: "true"
yamlMergeStrategy: "merge"
- name: "ubuntu-2204"
- name: "centos-8-6gb"
namespace: "xtext"
label: "ubuntu-2204"
label: "centos-8-6gb"
containers:
- name: "jnlp"
image: docker.io/eclipsecbi/jiro-agent-ubuntu-2204:remoting-3261.v9c670a_4748a_9
image: docker.io/eclipsecbi/jiro-agent-ubuntu-2404:remoting-3261.v9c670a_4748a_9
alwaysPullImage: true
livenessProbe:
failureThreshold: 0
Expand All @@ -214,7 +214,7 @@ jenkins:
value: ""
- envVar:
key: "JENKINS_REMOTING_JAVA_OPTS"
value: "-showversion -XshowSettings:vm -Xmx256m -Dorg.jenkinsci.remoting.engine.JnlpProtocol3.disabled=true -Dorg.jenkinsci.plugins.gitclient.CliGitAPIImpl.useSETSID=true"
value: "-showversion -XshowSettings:vm -Xmx512m -Dorg.jenkinsci.remoting.engine.JnlpProtocol3.disabled=true -Dorg.jenkinsci.plugins.gitclient.CliGitAPIImpl.useSETSID=true"
- envVar:
key: "OPENJ9_JAVA_OPTIONS"
value: "-XX:+IgnoreUnrecognizedVMOptions -XX:+IdleTuningCompactOnIdle -XX:+IdleTuningGcOnIdle"
Expand Down Expand Up @@ -266,10 +266,10 @@ jenkins:
resources:
limits:
cpu: "2000m"
memory: "4096Mi"
memory: "6144Mi"
requests:
cpu: "1000m"
memory: "4096Mi"
memory: "6144Mi"
volumeMounts:
- name: m2-secret-dir
mountPath: /home/jenkins/.m2/settings-security.xml
Expand Down Expand Up @@ -303,12 +303,12 @@ jenkins:
secretName: gradle-secret-dir
inheritYamlMergeStrategy: "true"
yamlMergeStrategy: "merge"
- name: "ubuntu-2404"
- name: "ubuntu-2204"
namespace: "xtext"
label: "ubuntu-latest ubuntu-2404 migration jipp-migration centos-7 centos-8 centos-latest"
label: "ubuntu-2204"
containers:
- name: "jnlp"
image: docker.io/eclipsecbi/jiro-agent-ubuntu-2404:remoting-3261.v9c670a_4748a_9
image: docker.io/eclipsecbi/jiro-agent-ubuntu-2204:remoting-3261.v9c670a_4748a_9
alwaysPullImage: true
livenessProbe:
failureThreshold: 0
Expand Down Expand Up @@ -416,9 +416,9 @@ jenkins:
secretName: gradle-secret-dir
inheritYamlMergeStrategy: "true"
yamlMergeStrategy: "merge"
- name: "ubuntu-2404-6gb"
- name: "ubuntu-2404"
namespace: "xtext"
label: "centos-7-6gb"
label: "ubuntu-latest ubuntu-2404 migration jipp-migration centos-7 centos-8 centos-latest"
containers:
- name: "jnlp"
image: docker.io/eclipsecbi/jiro-agent-ubuntu-2404:remoting-3261.v9c670a_4748a_9
Expand Down Expand Up @@ -492,10 +492,10 @@ jenkins:
resources:
limits:
cpu: "2000m"
memory: "6144Mi"
memory: "4096Mi"
requests:
cpu: "1000m"
memory: "6144Mi"
memory: "4096Mi"
volumeMounts:
- name: m2-secret-dir
mountPath: /home/jenkins/.m2/settings-security.xml
Expand Down Expand Up @@ -529,9 +529,9 @@ jenkins:
secretName: gradle-secret-dir
inheritYamlMergeStrategy: "true"
yamlMergeStrategy: "merge"
- name: "ubuntu-2404-6gb1"
- name: "ubuntu-2404-6gb"
namespace: "xtext"
label: "centos-8-6gb"
label: "centos-7-6gb centos-8-6gb"
containers:
- name: "jnlp"
image: docker.io/eclipsecbi/jiro-agent-ubuntu-2404:remoting-3261.v9c670a_4748a_9
Expand All @@ -553,7 +553,7 @@ jenkins:
value: ""
- envVar:
key: "JENKINS_REMOTING_JAVA_OPTS"
value: "-showversion -XshowSettings:vm -Xmx512m -Dorg.jenkinsci.remoting.engine.JnlpProtocol3.disabled=true -Dorg.jenkinsci.plugins.gitclient.CliGitAPIImpl.useSETSID=true"
value: "-showversion -XshowSettings:vm -Xmx256m -Dorg.jenkinsci.remoting.engine.JnlpProtocol3.disabled=true -Dorg.jenkinsci.plugins.gitclient.CliGitAPIImpl.useSETSID=true"
- envVar:
key: "OPENJ9_JAVA_OPTIONS"
value: "-XX:+IgnoreUnrecognizedVMOptions -XX:+IdleTuningCompactOnIdle -XX:+IdleTuningGcOnIdle"
Expand Down
Loading

0 comments on commit d87217d

Please sign in to comment.