diff --git a/instances/ee4j.cdi/config.jsonnet b/instances/ee4j.cdi/config.jsonnet index 3e03f12fd..db6da51dc 100644 --- a/instances/ee4j.cdi/config.jsonnet +++ b/instances/ee4j.cdi/config.jsonnet @@ -3,4 +3,5 @@ fullName: "ee4j.cdi", displayName: "Jakarta Contexts and Dependency Injection" }, + seLinuxLevel: "s0:c31,c25", } diff --git a/instances/ee4j.cdi/target/config.json b/instances/ee4j.cdi/target/config.json index bf65b2d8c..914d018e3 100644 --- a/instances/ee4j.cdi/target/config.json +++ b/instances/ee4j.cdi/target/config.json @@ -217,7 +217,7 @@ "docker.io/eclipsecbi/jiro-agent-centos-7:latest" ], "context": "centos-7", - "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-centos-7: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 [ \"uid_entrypoint\", \"/usr/local/bin/jenkins-agent\" ]\n\nADD \"https://repo.jenkins-ci.org/public/org/jenkins-ci/main/remoting/3206.3208.v409508a_675ff/remoting-3206.3208.v409508a_675ff.jar\" \"/usr/share/jenkins/agent.jar\" \nADD \"https://github.com/jenkinsci/docker-agent/raw/3206.vb_15dcf73f6a_9-12/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\nUSER 10001:0\n", + "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-centos-7: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/3206.3208.v409508a_675ff/remoting-3206.3208.v409508a_675ff.jar\" \"/usr/share/jenkins/agent.jar\"\nADD \"https://github.com/jenkinsci/docker-agent/raw/3206.vb_15dcf73f6a_9-12/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\nUSER 10001:0\n", "image": "jiro-agent-centos-7", "registry": "docker.io", "repository": "eclipsecbi", @@ -316,7 +316,7 @@ "docker.io/eclipsecbi/jiro-agent-centos-8:latest" ], "context": "centos-8", - "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-centos-8: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 [ \"uid_entrypoint\", \"/usr/local/bin/jenkins-agent\" ]\n\nADD \"https://repo.jenkins-ci.org/public/org/jenkins-ci/main/remoting/3206.3208.v409508a_675ff/remoting-3206.3208.v409508a_675ff.jar\" \"/usr/share/jenkins/agent.jar\" \nADD \"https://github.com/jenkinsci/docker-agent/raw/3206.vb_15dcf73f6a_9-12/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\nUSER 10001:0\n", + "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-centos-8: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/3206.3208.v409508a_675ff/remoting-3206.3208.v409508a_675ff.jar\" \"/usr/share/jenkins/agent.jar\"\nADD \"https://github.com/jenkinsci/docker-agent/raw/3206.vb_15dcf73f6a_9-12/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\nUSER 10001:0\n", "image": "jiro-agent-centos-8", "registry": "docker.io", "repository": "eclipsecbi", @@ -406,6 +406,203 @@ }, "startupScript": "/usr/local/bin/jenkins-agent", "username": "jenkins" + }, + "ubuntu-2204": { + "agentWorkdir": "/home/jenkins/jenkins-agent", + "docker": { + "aliases": [ + "docker.io/eclipsecbi/jiro-agent-ubuntu-2204:latest" + ], + "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-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/3206.3208.v409508a_675ff/remoting-3206.3208.v409508a_675ff.jar\" \"/usr/share/jenkins/agent.jar\"\nADD \"https://github.com/jenkinsci/docker-agent/raw/3206.vb_15dcf73f6a_9-12/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\nUSER 10001:0\n", + "image": "jiro-agent-ubuntu-2204", + "registry": "docker.io", + "repository": "eclipsecbi", + "tag": "remoting-3206.3208.v409508a_675ff" + }, + "env": { + "JAVA_TOOL_OPTIONS": [ ], + "JENKINS_REMOTING_JAVA_OPTS": [ + "-showversion", + "-XshowSettings:vm", + "-Xmx256m", + "-Dorg.jenkinsci.remoting.engine.JnlpProtocol3.disabled=true", + "-Dorg.jenkinsci.plugins.gitclient.CliGitAPIImpl.useSETSID=true" + ], + "OPENJ9_JAVA_OPTIONS": [ + "-XX:+IgnoreUnrecognizedVMOptions", + "-XX:+IdleTuningCompactOnIdle", + "-XX:+IdleTuningGcOnIdle" + ], + "_JAVA_OPTIONS": [ ] + }, + "home": "/home/jenkins", + "kubernetes": { + "inheritYamlMergeStrategy": true, + "resources": { + "cpu": { + "limit": "2000m", + "request": "1000m" + }, + "memory": { + "limit": "4096Mi", + "request": "4096Mi" + } + }, + "volumes": [ + { + "mounts": [ + { + "mountPath": "/home/jenkins/.m2/settings-security.xml", + "subPath": "settings-security.xml" + }, + { + "mountPath": "/home/jenkins/.m2/settings.xml", + "subPath": "settings.xml" + } + ], + "name": "m2-secret-dir", + "secret": { + "name": "m2-secret-dir" + } + }, + { + "configMap": { + "name": "m2-dir" + }, + "mounts": [ + { + "mountPath": "/home/jenkins/.m2/toolchains.xml", + "subPath": "toolchains.xml" + }, + { + "mountPath": "/home/jenkins/.mavenrc", + "subPath": ".mavenrc" + } + ], + "name": "m2-dir" + } + ], + "yamlMergeStrategy": "merge" + }, + "labels": [ + "ubuntu-2204" + ], + "maxHeap": "256m", + "mode": "EXCLUSIVE", + "name": "ubuntu-2204", + "remoting": { + "jar": "/usr/share/jenkins/agent.jar", + "startupScript": { + "name": "jenkins-agent", + "url": "https://github.com/jenkinsci/docker-agent/raw/3206.vb_15dcf73f6a_9-12/jenkins-agent", + "version": "3206.vb_15dcf73f6a_9-12" + }, + "url": "https://repo.jenkins-ci.org/public/org/jenkins-ci/main/remoting/3206.3208.v409508a_675ff/remoting-3206.3208.v409508a_675ff.jar", + "version": "3206.3208.v409508a_675ff" + }, + "startupScript": "/usr/local/bin/jenkins-agent", + "username": "jenkins" + }, + "ubuntu-2404": { + "agentWorkdir": "/home/jenkins/jenkins-agent", + "docker": { + "aliases": [ + "docker.io/eclipsecbi/jiro-agent-ubuntu-2404:latest" + ], + "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-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/3206.3208.v409508a_675ff/remoting-3206.3208.v409508a_675ff.jar\" \"/usr/share/jenkins/agent.jar\"\nADD \"https://github.com/jenkinsci/docker-agent/raw/3206.vb_15dcf73f6a_9-12/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\nUSER 10001:0\n", + "image": "jiro-agent-ubuntu-2404", + "registry": "docker.io", + "repository": "eclipsecbi", + "tag": "remoting-3206.3208.v409508a_675ff" + }, + "env": { + "JAVA_TOOL_OPTIONS": [ ], + "JENKINS_REMOTING_JAVA_OPTS": [ + "-showversion", + "-XshowSettings:vm", + "-Xmx256m", + "-Dorg.jenkinsci.remoting.engine.JnlpProtocol3.disabled=true", + "-Dorg.jenkinsci.plugins.gitclient.CliGitAPIImpl.useSETSID=true" + ], + "OPENJ9_JAVA_OPTIONS": [ + "-XX:+IgnoreUnrecognizedVMOptions", + "-XX:+IdleTuningCompactOnIdle", + "-XX:+IdleTuningGcOnIdle" + ], + "_JAVA_OPTIONS": [ ] + }, + "home": "/home/jenkins", + "kubernetes": { + "inheritYamlMergeStrategy": true, + "resources": { + "cpu": { + "limit": "2000m", + "request": "1000m" + }, + "memory": { + "limit": "4096Mi", + "request": "4096Mi" + } + }, + "volumes": [ + { + "mounts": [ + { + "mountPath": "/home/jenkins/.m2/settings-security.xml", + "subPath": "settings-security.xml" + }, + { + "mountPath": "/home/jenkins/.m2/settings.xml", + "subPath": "settings.xml" + } + ], + "name": "m2-secret-dir", + "secret": { + "name": "m2-secret-dir" + } + }, + { + "configMap": { + "name": "m2-dir" + }, + "mounts": [ + { + "mountPath": "/home/jenkins/.m2/toolchains.xml", + "subPath": "toolchains.xml" + }, + { + "mountPath": "/home/jenkins/.mavenrc", + "subPath": ".mavenrc" + } + ], + "name": "m2-dir" + } + ], + "yamlMergeStrategy": "merge" + }, + "labels": [ + "ubuntu-latest", + "ubuntu-2404" + ], + "maxHeap": "256m", + "mode": "EXCLUSIVE", + "name": "ubuntu-2404", + "remoting": { + "jar": "/usr/share/jenkins/agent.jar", + "startupScript": { + "name": "jenkins-agent", + "url": "https://github.com/jenkinsci/docker-agent/raw/3206.vb_15dcf73f6a_9-12/jenkins-agent", + "version": "3206.vb_15dcf73f6a_9-12" + }, + "url": "https://repo.jenkins-ci.org/public/org/jenkins-ci/main/remoting/3206.3208.v409508a_675ff/remoting-3206.3208.v409508a_675ff.jar", + "version": "3206.3208.v409508a_675ff" + }, + "startupScript": "/usr/local/bin/jenkins-agent", + "username": "jenkins" } } } @@ -753,6 +950,7 @@ }, "generate": false }, + "seLinuxLevel": "s0:c31,c25", "secrets": { "dockerconfigjson": { "dockerconfigjson-for-pull-as-cdi": { diff --git a/instances/ee4j.cdi/target/jenkins/configuration.yml b/instances/ee4j.cdi/target/jenkins/configuration.yml index 9f2c7f17f..6dd9cd75d 100644 --- a/instances/ee4j.cdi/target/jenkins/configuration.yml +++ b/instances/ee4j.cdi/target/jenkins/configuration.yml @@ -485,6 +485,188 @@ jenkins: name: m2-dir inheritYamlMergeStrategy: "true" yamlMergeStrategy: "merge" + - name: "ubuntu-2204" + namespace: "cdi" + label: "ubuntu-2204" + containers: + - name: "jnlp" + image: docker.io/eclipsecbi/jiro-agent-ubuntu-2204:remoting-3206.3208.v409508a_675ff + alwaysPullImage: true + livenessProbe: + failureThreshold: 0 + initialDelaySeconds: 0 + periodSeconds: 0 + successThreshold: 0 + timeoutSeconds: 0 + ttyEnabled: true + command: "" + args: "" + instanceCap: -1 + nodeUsageMode: EXCLUSIVE + envVars: + - envVar: + key: "JAVA_TOOL_OPTIONS" + 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" + - envVar: + key: "OPENJ9_JAVA_OPTIONS" + value: "-XX:+IgnoreUnrecognizedVMOptions -XX:+IdleTuningCompactOnIdle -XX:+IdleTuningGcOnIdle" + - envVar: + key: "_JAVA_OPTIONS" + value: "" + volumes: + - persistentVolumeClaim: + claimName: "tools-claim-jiro-cdi" + mountPath: "/opt/tools" + readOnly: true + - configMapVolume: + configMapName: "known-hosts" + mountPath: "/home/jenkins/.ssh/" + subPath: "." + - emptyDirVolume: + memory: false + mountPath: "/home/jenkins/" + - emptyDirVolume: + memory: false + mountPath: "/home/jenkins/.m2/repository" + - emptyDirVolume: + memory: false + mountPath: "/home/jenkins/.m2/wrapper" + workspaceVolume: + emptyDirWorkspaceVolume: + memory: false + yaml: | + apiVersion: v1 + kind: Pod + spec: + containers: + - name: jnlp + resources: + limits: + cpu: "2000m" + memory: "4096Mi" + requests: + cpu: "1000m" + memory: "4096Mi" + volumeMounts: + - name: m2-secret-dir + mountPath: /home/jenkins/.m2/settings-security.xml + subPath: settings-security.xml + readOnly: true + - name: m2-secret-dir + mountPath: /home/jenkins/.m2/settings.xml + subPath: settings.xml + readOnly: true + - name: m2-dir + mountPath: /home/jenkins/.m2/toolchains.xml + subPath: toolchains.xml + readOnly: true + - name: m2-dir + mountPath: /home/jenkins/.mavenrc + subPath: .mavenrc + readOnly: true + volumes: + - name: m2-secret-dir + secret: + secretName: m2-secret-dir + - name: m2-dir + configMap: + name: m2-dir + inheritYamlMergeStrategy: "true" + yamlMergeStrategy: "merge" + - name: "ubuntu-2404" + namespace: "cdi" + label: "ubuntu-latest ubuntu-2404" + containers: + - name: "jnlp" + image: docker.io/eclipsecbi/jiro-agent-ubuntu-2404:remoting-3206.3208.v409508a_675ff + alwaysPullImage: true + livenessProbe: + failureThreshold: 0 + initialDelaySeconds: 0 + periodSeconds: 0 + successThreshold: 0 + timeoutSeconds: 0 + ttyEnabled: true + command: "" + args: "" + instanceCap: -1 + nodeUsageMode: EXCLUSIVE + envVars: + - envVar: + key: "JAVA_TOOL_OPTIONS" + 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" + - envVar: + key: "OPENJ9_JAVA_OPTIONS" + value: "-XX:+IgnoreUnrecognizedVMOptions -XX:+IdleTuningCompactOnIdle -XX:+IdleTuningGcOnIdle" + - envVar: + key: "_JAVA_OPTIONS" + value: "" + volumes: + - persistentVolumeClaim: + claimName: "tools-claim-jiro-cdi" + mountPath: "/opt/tools" + readOnly: true + - configMapVolume: + configMapName: "known-hosts" + mountPath: "/home/jenkins/.ssh/" + subPath: "." + - emptyDirVolume: + memory: false + mountPath: "/home/jenkins/" + - emptyDirVolume: + memory: false + mountPath: "/home/jenkins/.m2/repository" + - emptyDirVolume: + memory: false + mountPath: "/home/jenkins/.m2/wrapper" + workspaceVolume: + emptyDirWorkspaceVolume: + memory: false + yaml: | + apiVersion: v1 + kind: Pod + spec: + containers: + - name: jnlp + resources: + limits: + cpu: "2000m" + memory: "4096Mi" + requests: + cpu: "1000m" + memory: "4096Mi" + volumeMounts: + - name: m2-secret-dir + mountPath: /home/jenkins/.m2/settings-security.xml + subPath: settings-security.xml + readOnly: true + - name: m2-secret-dir + mountPath: /home/jenkins/.m2/settings.xml + subPath: settings.xml + readOnly: true + - name: m2-dir + mountPath: /home/jenkins/.m2/toolchains.xml + subPath: toolchains.xml + readOnly: true + - name: m2-dir + mountPath: /home/jenkins/.mavenrc + subPath: .mavenrc + readOnly: true + volumes: + - name: m2-secret-dir + secret: + secretName: m2-secret-dir + - name: m2-dir + configMap: + name: m2-dir + inheritYamlMergeStrategy: "true" + yamlMergeStrategy: "merge" security: apiToken: creationOfLegacyTokenEnabled: false @@ -579,6 +761,8 @@ tool: home: "/opt/tools/java/openjdk/latest" - name: "openjdk-ea-latest" home: "/opt/tools/java/openjdk/ea-latest" + - name: "openjdk-jdk24-latest" + home: "/opt/tools/java/openjdk/jdk-24/latest" - name: "openjdk-jdk23-latest" home: "/opt/tools/java/openjdk/jdk-23/latest" - name: "openjdk-jdk22-latest" @@ -708,6 +892,8 @@ tool: installations: - name: "apache-maven-latest" home: "/opt/tools/apache-maven/latest" + - name: "apache-maven-3.9.9" + home: "/opt/tools/apache-maven/3.9.9" - name: "apache-maven-3.9.6" home: "/opt/tools/apache-maven/3.9.6" - name: "apache-maven-3.9.5" diff --git a/instances/ee4j.cdi/target/k8s/configmap-jenkins-config.yml b/instances/ee4j.cdi/target/k8s/configmap-jenkins-config.yml index 24defe0b5..675f6dbfd 100644 --- a/instances/ee4j.cdi/target/k8s/configmap-jenkins-config.yml +++ b/instances/ee4j.cdi/target/k8s/configmap-jenkins-config.yml @@ -508,6 +508,188 @@ data: name: m2-dir inheritYamlMergeStrategy: "true" yamlMergeStrategy: "merge" + - name: "ubuntu-2204" + namespace: "cdi" + label: "ubuntu-2204" + containers: + - name: "jnlp" + image: docker.io/eclipsecbi/jiro-agent-ubuntu-2204:remoting-3206.3208.v409508a_675ff + alwaysPullImage: true + livenessProbe: + failureThreshold: 0 + initialDelaySeconds: 0 + periodSeconds: 0 + successThreshold: 0 + timeoutSeconds: 0 + ttyEnabled: true + command: "" + args: "" + instanceCap: -1 + nodeUsageMode: EXCLUSIVE + envVars: + - envVar: + key: "JAVA_TOOL_OPTIONS" + 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" + - envVar: + key: "OPENJ9_JAVA_OPTIONS" + value: "-XX:+IgnoreUnrecognizedVMOptions -XX:+IdleTuningCompactOnIdle -XX:+IdleTuningGcOnIdle" + - envVar: + key: "_JAVA_OPTIONS" + value: "" + volumes: + - persistentVolumeClaim: + claimName: "tools-claim-jiro-cdi" + mountPath: "/opt/tools" + readOnly: true + - configMapVolume: + configMapName: "known-hosts" + mountPath: "/home/jenkins/.ssh/" + subPath: "." + - emptyDirVolume: + memory: false + mountPath: "/home/jenkins/" + - emptyDirVolume: + memory: false + mountPath: "/home/jenkins/.m2/repository" + - emptyDirVolume: + memory: false + mountPath: "/home/jenkins/.m2/wrapper" + workspaceVolume: + emptyDirWorkspaceVolume: + memory: false + yaml: | + apiVersion: v1 + kind: Pod + spec: + containers: + - name: jnlp + resources: + limits: + cpu: "2000m" + memory: "4096Mi" + requests: + cpu: "1000m" + memory: "4096Mi" + volumeMounts: + - name: m2-secret-dir + mountPath: /home/jenkins/.m2/settings-security.xml + subPath: settings-security.xml + readOnly: true + - name: m2-secret-dir + mountPath: /home/jenkins/.m2/settings.xml + subPath: settings.xml + readOnly: true + - name: m2-dir + mountPath: /home/jenkins/.m2/toolchains.xml + subPath: toolchains.xml + readOnly: true + - name: m2-dir + mountPath: /home/jenkins/.mavenrc + subPath: .mavenrc + readOnly: true + volumes: + - name: m2-secret-dir + secret: + secretName: m2-secret-dir + - name: m2-dir + configMap: + name: m2-dir + inheritYamlMergeStrategy: "true" + yamlMergeStrategy: "merge" + - name: "ubuntu-2404" + namespace: "cdi" + label: "ubuntu-latest ubuntu-2404" + containers: + - name: "jnlp" + image: docker.io/eclipsecbi/jiro-agent-ubuntu-2404:remoting-3206.3208.v409508a_675ff + alwaysPullImage: true + livenessProbe: + failureThreshold: 0 + initialDelaySeconds: 0 + periodSeconds: 0 + successThreshold: 0 + timeoutSeconds: 0 + ttyEnabled: true + command: "" + args: "" + instanceCap: -1 + nodeUsageMode: EXCLUSIVE + envVars: + - envVar: + key: "JAVA_TOOL_OPTIONS" + 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" + - envVar: + key: "OPENJ9_JAVA_OPTIONS" + value: "-XX:+IgnoreUnrecognizedVMOptions -XX:+IdleTuningCompactOnIdle -XX:+IdleTuningGcOnIdle" + - envVar: + key: "_JAVA_OPTIONS" + value: "" + volumes: + - persistentVolumeClaim: + claimName: "tools-claim-jiro-cdi" + mountPath: "/opt/tools" + readOnly: true + - configMapVolume: + configMapName: "known-hosts" + mountPath: "/home/jenkins/.ssh/" + subPath: "." + - emptyDirVolume: + memory: false + mountPath: "/home/jenkins/" + - emptyDirVolume: + memory: false + mountPath: "/home/jenkins/.m2/repository" + - emptyDirVolume: + memory: false + mountPath: "/home/jenkins/.m2/wrapper" + workspaceVolume: + emptyDirWorkspaceVolume: + memory: false + yaml: | + apiVersion: v1 + kind: Pod + spec: + containers: + - name: jnlp + resources: + limits: + cpu: "2000m" + memory: "4096Mi" + requests: + cpu: "1000m" + memory: "4096Mi" + volumeMounts: + - name: m2-secret-dir + mountPath: /home/jenkins/.m2/settings-security.xml + subPath: settings-security.xml + readOnly: true + - name: m2-secret-dir + mountPath: /home/jenkins/.m2/settings.xml + subPath: settings.xml + readOnly: true + - name: m2-dir + mountPath: /home/jenkins/.m2/toolchains.xml + subPath: toolchains.xml + readOnly: true + - name: m2-dir + mountPath: /home/jenkins/.mavenrc + subPath: .mavenrc + readOnly: true + volumes: + - name: m2-secret-dir + secret: + secretName: m2-secret-dir + - name: m2-dir + configMap: + name: m2-dir + inheritYamlMergeStrategy: "true" + yamlMergeStrategy: "merge" security: apiToken: creationOfLegacyTokenEnabled: false @@ -602,6 +784,8 @@ data: home: "/opt/tools/java/openjdk/latest" - name: "openjdk-ea-latest" home: "/opt/tools/java/openjdk/ea-latest" + - name: "openjdk-jdk24-latest" + home: "/opt/tools/java/openjdk/jdk-24/latest" - name: "openjdk-jdk23-latest" home: "/opt/tools/java/openjdk/jdk-23/latest" - name: "openjdk-jdk22-latest" @@ -731,6 +915,8 @@ data: installations: - name: "apache-maven-latest" home: "/opt/tools/apache-maven/latest" + - name: "apache-maven-3.9.9" + home: "/opt/tools/apache-maven/3.9.9" - name: "apache-maven-3.9.6" home: "/opt/tools/apache-maven/3.9.6" - name: "apache-maven-3.9.5" diff --git a/instances/ee4j.cdi/target/k8s/m2-dir.json b/instances/ee4j.cdi/target/k8s/m2-dir.json index 6bfd959db..320231afd 100644 --- a/instances/ee4j.cdi/target/k8s/m2-dir.json +++ b/instances/ee4j.cdi/target/k8s/m2-dir.json @@ -2,7 +2,7 @@ "apiVersion": "v1", "data": { ".mavenrc": "set -- -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn --batch-mode \"${@}\"", - "toolchains.xml": "\n\n \n jdk\n \n JavaSE-1.8\n 1.8\n oracle\n \n /opt/tools/java/oracle/jdk-8/latest\n \n \n jdk\n \n JavaSE-9\n 9\n openjdk\n \n /opt/tools/java/openjdk/jdk-9/latest\n \n \n jdk\n \n JavaSE-10\n 10\n openjdk\n \n /opt/tools/java/openjdk/jdk-10/latest\n \n \n jdk\n \n JavaSE-11\n 11\n openjdk\n \n /opt/tools/java/openjdk/jdk-11/latest\n \n \n jdk\n \n JavaSE-12\n 12\n openjdk\n \n /opt/tools/java/openjdk/jdk-12/latest\n \n \n jdk\n \n JavaSE-13\n 13\n openjdk\n \n /opt/tools/java/openjdk/jdk-13/latest\n \n \n jdk\n \n JavaSE-14\n 14\n openjdk\n \n /opt/tools/java/openjdk/jdk-14/latest\n \n \n jdk\n \n JavaSE-15\n 15\n openjdk\n \n /opt/tools/java/openjdk/jdk-15/latest\n \n \n jdk\n \n JavaSE-16\n 16\n openjdk\n \n /opt/tools/java/openjdk/jdk-16/latest\n \n \n jdk\n \n JavaSE-17\n 17\n openjdk\n \n /opt/tools/java/openjdk/jdk-17/latest\n \n \n jdk\n \n JavaSE-18\n 18\n openjdk\n \n /opt/tools/java/openjdk/jdk-18/latest\n \n \n jdk\n \n JavaSE-19\n 19\n openjdk\n \n /opt/tools/java/openjdk/jdk-19/latest\n \n \n jdk\n \n JavaSE-20\n 20\n openjdk\n \n /opt/tools/java/openjdk/jdk-20/latest\n \n \n jdk\n \n JavaSE-21\n 21\n openjdk\n \n /opt/tools/java/openjdk/jdk-21/latest\n \n \n jdk\n \n JavaSE-22\n 22\n openjdk\n \n /opt/tools/java/openjdk/jdk-22/latest\n \n \n jdk\n \n JavaSE-23\n 23\n openjdk\n \n /opt/tools/java/openjdk/jdk-23/latest\n \n\n" + "toolchains.xml": "\n\n \n jdk\n \n JavaSE-1.8\n 1.8\n oracle\n \n /opt/tools/java/oracle/jdk-8/latest\n \n \n jdk\n \n JavaSE-9\n 9\n openjdk\n \n /opt/tools/java/openjdk/jdk-9/latest\n \n \n jdk\n \n JavaSE-10\n 10\n openjdk\n \n /opt/tools/java/openjdk/jdk-10/latest\n \n \n jdk\n \n JavaSE-11\n 11\n openjdk\n \n /opt/tools/java/openjdk/jdk-11/latest\n \n \n jdk\n \n JavaSE-12\n 12\n openjdk\n \n /opt/tools/java/openjdk/jdk-12/latest\n \n \n jdk\n \n JavaSE-13\n 13\n openjdk\n \n /opt/tools/java/openjdk/jdk-13/latest\n \n \n jdk\n \n JavaSE-14\n 14\n openjdk\n \n /opt/tools/java/openjdk/jdk-14/latest\n \n \n jdk\n \n JavaSE-15\n 15\n openjdk\n \n /opt/tools/java/openjdk/jdk-15/latest\n \n \n jdk\n \n JavaSE-16\n 16\n openjdk\n \n /opt/tools/java/openjdk/jdk-16/latest\n \n \n jdk\n \n JavaSE-17\n 17\n openjdk\n \n /opt/tools/java/openjdk/jdk-17/latest\n \n \n jdk\n \n JavaSE-18\n 18\n openjdk\n \n /opt/tools/java/openjdk/jdk-18/latest\n \n \n jdk\n \n JavaSE-19\n 19\n openjdk\n \n /opt/tools/java/openjdk/jdk-19/latest\n \n \n jdk\n \n JavaSE-20\n 20\n openjdk\n \n /opt/tools/java/openjdk/jdk-20/latest\n \n \n jdk\n \n JavaSE-21\n 21\n openjdk\n \n /opt/tools/java/openjdk/jdk-21/latest\n \n \n jdk\n \n JavaSE-22\n 22\n openjdk\n \n /opt/tools/java/openjdk/jdk-22/latest\n \n \n jdk\n \n JavaSE-23\n 23\n openjdk\n \n /opt/tools/java/openjdk/jdk-23/latest\n \n \n jdk\n \n JavaSE-24\n 24\n openjdk\n \n /opt/tools/java/openjdk/jdk-24/latest\n \n\n" }, "kind": "ConfigMap", "metadata": { diff --git a/instances/ee4j.cdi/target/k8s/statefulset.json b/instances/ee4j.cdi/target/k8s/statefulset.json index 9d03c2d44..ebf63a501 100644 --- a/instances/ee4j.cdi/target/k8s/statefulset.json +++ b/instances/ee4j.cdi/target/k8s/statefulset.json @@ -119,6 +119,12 @@ "cpu": "250m" } }, + "securityContext": { + "seLinuxOptions": { + "level": "s0:c31,c25", + "type": "spc_t" + } + }, "volumeMounts": [ { "mountPath": "/var/jenkins", diff --git a/instances/ee4j.cu/config.jsonnet b/instances/ee4j.cu/config.jsonnet index 2f7d59a52..5dfcab8ae 100644 --- a/instances/ee4j.cu/config.jsonnet +++ b/instances/ee4j.cu/config.jsonnet @@ -8,4 +8,5 @@ "copyartifact", ], }, + seLinuxLevel: "s0:c34,c4", } diff --git a/instances/ee4j.cu/target/config.json b/instances/ee4j.cu/target/config.json index 1b6df45a0..3b7831be0 100644 --- a/instances/ee4j.cu/target/config.json +++ b/instances/ee4j.cu/target/config.json @@ -217,7 +217,7 @@ "docker.io/eclipsecbi/jiro-agent-centos-7:latest" ], "context": "centos-7", - "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-centos-7: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 [ \"uid_entrypoint\", \"/usr/local/bin/jenkins-agent\" ]\n\nADD \"https://repo.jenkins-ci.org/public/org/jenkins-ci/main/remoting/3206.3208.v409508a_675ff/remoting-3206.3208.v409508a_675ff.jar\" \"/usr/share/jenkins/agent.jar\" \nADD \"https://github.com/jenkinsci/docker-agent/raw/3206.vb_15dcf73f6a_9-12/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\nUSER 10001:0\n", + "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-centos-7: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/3206.3208.v409508a_675ff/remoting-3206.3208.v409508a_675ff.jar\" \"/usr/share/jenkins/agent.jar\"\nADD \"https://github.com/jenkinsci/docker-agent/raw/3206.vb_15dcf73f6a_9-12/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\nUSER 10001:0\n", "image": "jiro-agent-centos-7", "registry": "docker.io", "repository": "eclipsecbi", @@ -316,7 +316,7 @@ "docker.io/eclipsecbi/jiro-agent-centos-8:latest" ], "context": "centos-8", - "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-centos-8: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 [ \"uid_entrypoint\", \"/usr/local/bin/jenkins-agent\" ]\n\nADD \"https://repo.jenkins-ci.org/public/org/jenkins-ci/main/remoting/3206.3208.v409508a_675ff/remoting-3206.3208.v409508a_675ff.jar\" \"/usr/share/jenkins/agent.jar\" \nADD \"https://github.com/jenkinsci/docker-agent/raw/3206.vb_15dcf73f6a_9-12/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\nUSER 10001:0\n", + "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-centos-8: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/3206.3208.v409508a_675ff/remoting-3206.3208.v409508a_675ff.jar\" \"/usr/share/jenkins/agent.jar\"\nADD \"https://github.com/jenkinsci/docker-agent/raw/3206.vb_15dcf73f6a_9-12/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\nUSER 10001:0\n", "image": "jiro-agent-centos-8", "registry": "docker.io", "repository": "eclipsecbi", @@ -406,6 +406,203 @@ }, "startupScript": "/usr/local/bin/jenkins-agent", "username": "jenkins" + }, + "ubuntu-2204": { + "agentWorkdir": "/home/jenkins/jenkins-agent", + "docker": { + "aliases": [ + "docker.io/eclipsecbi/jiro-agent-ubuntu-2204:latest" + ], + "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-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/3206.3208.v409508a_675ff/remoting-3206.3208.v409508a_675ff.jar\" \"/usr/share/jenkins/agent.jar\"\nADD \"https://github.com/jenkinsci/docker-agent/raw/3206.vb_15dcf73f6a_9-12/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\nUSER 10001:0\n", + "image": "jiro-agent-ubuntu-2204", + "registry": "docker.io", + "repository": "eclipsecbi", + "tag": "remoting-3206.3208.v409508a_675ff" + }, + "env": { + "JAVA_TOOL_OPTIONS": [ ], + "JENKINS_REMOTING_JAVA_OPTS": [ + "-showversion", + "-XshowSettings:vm", + "-Xmx256m", + "-Dorg.jenkinsci.remoting.engine.JnlpProtocol3.disabled=true", + "-Dorg.jenkinsci.plugins.gitclient.CliGitAPIImpl.useSETSID=true" + ], + "OPENJ9_JAVA_OPTIONS": [ + "-XX:+IgnoreUnrecognizedVMOptions", + "-XX:+IdleTuningCompactOnIdle", + "-XX:+IdleTuningGcOnIdle" + ], + "_JAVA_OPTIONS": [ ] + }, + "home": "/home/jenkins", + "kubernetes": { + "inheritYamlMergeStrategy": true, + "resources": { + "cpu": { + "limit": "2000m", + "request": "1000m" + }, + "memory": { + "limit": "4096Mi", + "request": "4096Mi" + } + }, + "volumes": [ + { + "mounts": [ + { + "mountPath": "/home/jenkins/.m2/settings-security.xml", + "subPath": "settings-security.xml" + }, + { + "mountPath": "/home/jenkins/.m2/settings.xml", + "subPath": "settings.xml" + } + ], + "name": "m2-secret-dir", + "secret": { + "name": "m2-secret-dir" + } + }, + { + "configMap": { + "name": "m2-dir" + }, + "mounts": [ + { + "mountPath": "/home/jenkins/.m2/toolchains.xml", + "subPath": "toolchains.xml" + }, + { + "mountPath": "/home/jenkins/.mavenrc", + "subPath": ".mavenrc" + } + ], + "name": "m2-dir" + } + ], + "yamlMergeStrategy": "merge" + }, + "labels": [ + "ubuntu-2204" + ], + "maxHeap": "256m", + "mode": "EXCLUSIVE", + "name": "ubuntu-2204", + "remoting": { + "jar": "/usr/share/jenkins/agent.jar", + "startupScript": { + "name": "jenkins-agent", + "url": "https://github.com/jenkinsci/docker-agent/raw/3206.vb_15dcf73f6a_9-12/jenkins-agent", + "version": "3206.vb_15dcf73f6a_9-12" + }, + "url": "https://repo.jenkins-ci.org/public/org/jenkins-ci/main/remoting/3206.3208.v409508a_675ff/remoting-3206.3208.v409508a_675ff.jar", + "version": "3206.3208.v409508a_675ff" + }, + "startupScript": "/usr/local/bin/jenkins-agent", + "username": "jenkins" + }, + "ubuntu-2404": { + "agentWorkdir": "/home/jenkins/jenkins-agent", + "docker": { + "aliases": [ + "docker.io/eclipsecbi/jiro-agent-ubuntu-2404:latest" + ], + "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-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/3206.3208.v409508a_675ff/remoting-3206.3208.v409508a_675ff.jar\" \"/usr/share/jenkins/agent.jar\"\nADD \"https://github.com/jenkinsci/docker-agent/raw/3206.vb_15dcf73f6a_9-12/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\nUSER 10001:0\n", + "image": "jiro-agent-ubuntu-2404", + "registry": "docker.io", + "repository": "eclipsecbi", + "tag": "remoting-3206.3208.v409508a_675ff" + }, + "env": { + "JAVA_TOOL_OPTIONS": [ ], + "JENKINS_REMOTING_JAVA_OPTS": [ + "-showversion", + "-XshowSettings:vm", + "-Xmx256m", + "-Dorg.jenkinsci.remoting.engine.JnlpProtocol3.disabled=true", + "-Dorg.jenkinsci.plugins.gitclient.CliGitAPIImpl.useSETSID=true" + ], + "OPENJ9_JAVA_OPTIONS": [ + "-XX:+IgnoreUnrecognizedVMOptions", + "-XX:+IdleTuningCompactOnIdle", + "-XX:+IdleTuningGcOnIdle" + ], + "_JAVA_OPTIONS": [ ] + }, + "home": "/home/jenkins", + "kubernetes": { + "inheritYamlMergeStrategy": true, + "resources": { + "cpu": { + "limit": "2000m", + "request": "1000m" + }, + "memory": { + "limit": "4096Mi", + "request": "4096Mi" + } + }, + "volumes": [ + { + "mounts": [ + { + "mountPath": "/home/jenkins/.m2/settings-security.xml", + "subPath": "settings-security.xml" + }, + { + "mountPath": "/home/jenkins/.m2/settings.xml", + "subPath": "settings.xml" + } + ], + "name": "m2-secret-dir", + "secret": { + "name": "m2-secret-dir" + } + }, + { + "configMap": { + "name": "m2-dir" + }, + "mounts": [ + { + "mountPath": "/home/jenkins/.m2/toolchains.xml", + "subPath": "toolchains.xml" + }, + { + "mountPath": "/home/jenkins/.mavenrc", + "subPath": ".mavenrc" + } + ], + "name": "m2-dir" + } + ], + "yamlMergeStrategy": "merge" + }, + "labels": [ + "ubuntu-latest", + "ubuntu-2404" + ], + "maxHeap": "256m", + "mode": "EXCLUSIVE", + "name": "ubuntu-2404", + "remoting": { + "jar": "/usr/share/jenkins/agent.jar", + "startupScript": { + "name": "jenkins-agent", + "url": "https://github.com/jenkinsci/docker-agent/raw/3206.vb_15dcf73f6a_9-12/jenkins-agent", + "version": "3206.vb_15dcf73f6a_9-12" + }, + "url": "https://repo.jenkins-ci.org/public/org/jenkins-ci/main/remoting/3206.3208.v409508a_675ff/remoting-3206.3208.v409508a_675ff.jar", + "version": "3206.3208.v409508a_675ff" + }, + "startupScript": "/usr/local/bin/jenkins-agent", + "username": "jenkins" } } } @@ -754,6 +951,7 @@ }, "generate": false }, + "seLinuxLevel": "s0:c34,c4", "secrets": { "dockerconfigjson": { "dockerconfigjson-for-pull-as-cu": { diff --git a/instances/ee4j.cu/target/jenkins/configuration.yml b/instances/ee4j.cu/target/jenkins/configuration.yml index d6d9d0c6b..62abd73b3 100644 --- a/instances/ee4j.cu/target/jenkins/configuration.yml +++ b/instances/ee4j.cu/target/jenkins/configuration.yml @@ -485,6 +485,188 @@ jenkins: name: m2-dir inheritYamlMergeStrategy: "true" yamlMergeStrategy: "merge" + - name: "ubuntu-2204" + namespace: "cu" + label: "ubuntu-2204" + containers: + - name: "jnlp" + image: docker.io/eclipsecbi/jiro-agent-ubuntu-2204:remoting-3206.3208.v409508a_675ff + alwaysPullImage: true + livenessProbe: + failureThreshold: 0 + initialDelaySeconds: 0 + periodSeconds: 0 + successThreshold: 0 + timeoutSeconds: 0 + ttyEnabled: true + command: "" + args: "" + instanceCap: -1 + nodeUsageMode: EXCLUSIVE + envVars: + - envVar: + key: "JAVA_TOOL_OPTIONS" + 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" + - envVar: + key: "OPENJ9_JAVA_OPTIONS" + value: "-XX:+IgnoreUnrecognizedVMOptions -XX:+IdleTuningCompactOnIdle -XX:+IdleTuningGcOnIdle" + - envVar: + key: "_JAVA_OPTIONS" + value: "" + volumes: + - persistentVolumeClaim: + claimName: "tools-claim-jiro-cu" + mountPath: "/opt/tools" + readOnly: true + - configMapVolume: + configMapName: "known-hosts" + mountPath: "/home/jenkins/.ssh/" + subPath: "." + - emptyDirVolume: + memory: false + mountPath: "/home/jenkins/" + - emptyDirVolume: + memory: false + mountPath: "/home/jenkins/.m2/repository" + - emptyDirVolume: + memory: false + mountPath: "/home/jenkins/.m2/wrapper" + workspaceVolume: + emptyDirWorkspaceVolume: + memory: false + yaml: | + apiVersion: v1 + kind: Pod + spec: + containers: + - name: jnlp + resources: + limits: + cpu: "2000m" + memory: "4096Mi" + requests: + cpu: "1000m" + memory: "4096Mi" + volumeMounts: + - name: m2-secret-dir + mountPath: /home/jenkins/.m2/settings-security.xml + subPath: settings-security.xml + readOnly: true + - name: m2-secret-dir + mountPath: /home/jenkins/.m2/settings.xml + subPath: settings.xml + readOnly: true + - name: m2-dir + mountPath: /home/jenkins/.m2/toolchains.xml + subPath: toolchains.xml + readOnly: true + - name: m2-dir + mountPath: /home/jenkins/.mavenrc + subPath: .mavenrc + readOnly: true + volumes: + - name: m2-secret-dir + secret: + secretName: m2-secret-dir + - name: m2-dir + configMap: + name: m2-dir + inheritYamlMergeStrategy: "true" + yamlMergeStrategy: "merge" + - name: "ubuntu-2404" + namespace: "cu" + label: "ubuntu-latest ubuntu-2404" + containers: + - name: "jnlp" + image: docker.io/eclipsecbi/jiro-agent-ubuntu-2404:remoting-3206.3208.v409508a_675ff + alwaysPullImage: true + livenessProbe: + failureThreshold: 0 + initialDelaySeconds: 0 + periodSeconds: 0 + successThreshold: 0 + timeoutSeconds: 0 + ttyEnabled: true + command: "" + args: "" + instanceCap: -1 + nodeUsageMode: EXCLUSIVE + envVars: + - envVar: + key: "JAVA_TOOL_OPTIONS" + 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" + - envVar: + key: "OPENJ9_JAVA_OPTIONS" + value: "-XX:+IgnoreUnrecognizedVMOptions -XX:+IdleTuningCompactOnIdle -XX:+IdleTuningGcOnIdle" + - envVar: + key: "_JAVA_OPTIONS" + value: "" + volumes: + - persistentVolumeClaim: + claimName: "tools-claim-jiro-cu" + mountPath: "/opt/tools" + readOnly: true + - configMapVolume: + configMapName: "known-hosts" + mountPath: "/home/jenkins/.ssh/" + subPath: "." + - emptyDirVolume: + memory: false + mountPath: "/home/jenkins/" + - emptyDirVolume: + memory: false + mountPath: "/home/jenkins/.m2/repository" + - emptyDirVolume: + memory: false + mountPath: "/home/jenkins/.m2/wrapper" + workspaceVolume: + emptyDirWorkspaceVolume: + memory: false + yaml: | + apiVersion: v1 + kind: Pod + spec: + containers: + - name: jnlp + resources: + limits: + cpu: "2000m" + memory: "4096Mi" + requests: + cpu: "1000m" + memory: "4096Mi" + volumeMounts: + - name: m2-secret-dir + mountPath: /home/jenkins/.m2/settings-security.xml + subPath: settings-security.xml + readOnly: true + - name: m2-secret-dir + mountPath: /home/jenkins/.m2/settings.xml + subPath: settings.xml + readOnly: true + - name: m2-dir + mountPath: /home/jenkins/.m2/toolchains.xml + subPath: toolchains.xml + readOnly: true + - name: m2-dir + mountPath: /home/jenkins/.mavenrc + subPath: .mavenrc + readOnly: true + volumes: + - name: m2-secret-dir + secret: + secretName: m2-secret-dir + - name: m2-dir + configMap: + name: m2-dir + inheritYamlMergeStrategy: "true" + yamlMergeStrategy: "merge" security: apiToken: creationOfLegacyTokenEnabled: false @@ -579,6 +761,8 @@ tool: home: "/opt/tools/java/openjdk/latest" - name: "openjdk-ea-latest" home: "/opt/tools/java/openjdk/ea-latest" + - name: "openjdk-jdk24-latest" + home: "/opt/tools/java/openjdk/jdk-24/latest" - name: "openjdk-jdk23-latest" home: "/opt/tools/java/openjdk/jdk-23/latest" - name: "openjdk-jdk22-latest" @@ -708,6 +892,8 @@ tool: installations: - name: "apache-maven-latest" home: "/opt/tools/apache-maven/latest" + - name: "apache-maven-3.9.9" + home: "/opt/tools/apache-maven/3.9.9" - name: "apache-maven-3.9.6" home: "/opt/tools/apache-maven/3.9.6" - name: "apache-maven-3.9.5" diff --git a/instances/ee4j.cu/target/k8s/configmap-jenkins-config.yml b/instances/ee4j.cu/target/k8s/configmap-jenkins-config.yml index 12b3eb05d..0b383bf14 100644 --- a/instances/ee4j.cu/target/k8s/configmap-jenkins-config.yml +++ b/instances/ee4j.cu/target/k8s/configmap-jenkins-config.yml @@ -508,6 +508,188 @@ data: name: m2-dir inheritYamlMergeStrategy: "true" yamlMergeStrategy: "merge" + - name: "ubuntu-2204" + namespace: "cu" + label: "ubuntu-2204" + containers: + - name: "jnlp" + image: docker.io/eclipsecbi/jiro-agent-ubuntu-2204:remoting-3206.3208.v409508a_675ff + alwaysPullImage: true + livenessProbe: + failureThreshold: 0 + initialDelaySeconds: 0 + periodSeconds: 0 + successThreshold: 0 + timeoutSeconds: 0 + ttyEnabled: true + command: "" + args: "" + instanceCap: -1 + nodeUsageMode: EXCLUSIVE + envVars: + - envVar: + key: "JAVA_TOOL_OPTIONS" + 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" + - envVar: + key: "OPENJ9_JAVA_OPTIONS" + value: "-XX:+IgnoreUnrecognizedVMOptions -XX:+IdleTuningCompactOnIdle -XX:+IdleTuningGcOnIdle" + - envVar: + key: "_JAVA_OPTIONS" + value: "" + volumes: + - persistentVolumeClaim: + claimName: "tools-claim-jiro-cu" + mountPath: "/opt/tools" + readOnly: true + - configMapVolume: + configMapName: "known-hosts" + mountPath: "/home/jenkins/.ssh/" + subPath: "." + - emptyDirVolume: + memory: false + mountPath: "/home/jenkins/" + - emptyDirVolume: + memory: false + mountPath: "/home/jenkins/.m2/repository" + - emptyDirVolume: + memory: false + mountPath: "/home/jenkins/.m2/wrapper" + workspaceVolume: + emptyDirWorkspaceVolume: + memory: false + yaml: | + apiVersion: v1 + kind: Pod + spec: + containers: + - name: jnlp + resources: + limits: + cpu: "2000m" + memory: "4096Mi" + requests: + cpu: "1000m" + memory: "4096Mi" + volumeMounts: + - name: m2-secret-dir + mountPath: /home/jenkins/.m2/settings-security.xml + subPath: settings-security.xml + readOnly: true + - name: m2-secret-dir + mountPath: /home/jenkins/.m2/settings.xml + subPath: settings.xml + readOnly: true + - name: m2-dir + mountPath: /home/jenkins/.m2/toolchains.xml + subPath: toolchains.xml + readOnly: true + - name: m2-dir + mountPath: /home/jenkins/.mavenrc + subPath: .mavenrc + readOnly: true + volumes: + - name: m2-secret-dir + secret: + secretName: m2-secret-dir + - name: m2-dir + configMap: + name: m2-dir + inheritYamlMergeStrategy: "true" + yamlMergeStrategy: "merge" + - name: "ubuntu-2404" + namespace: "cu" + label: "ubuntu-latest ubuntu-2404" + containers: + - name: "jnlp" + image: docker.io/eclipsecbi/jiro-agent-ubuntu-2404:remoting-3206.3208.v409508a_675ff + alwaysPullImage: true + livenessProbe: + failureThreshold: 0 + initialDelaySeconds: 0 + periodSeconds: 0 + successThreshold: 0 + timeoutSeconds: 0 + ttyEnabled: true + command: "" + args: "" + instanceCap: -1 + nodeUsageMode: EXCLUSIVE + envVars: + - envVar: + key: "JAVA_TOOL_OPTIONS" + 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" + - envVar: + key: "OPENJ9_JAVA_OPTIONS" + value: "-XX:+IgnoreUnrecognizedVMOptions -XX:+IdleTuningCompactOnIdle -XX:+IdleTuningGcOnIdle" + - envVar: + key: "_JAVA_OPTIONS" + value: "" + volumes: + - persistentVolumeClaim: + claimName: "tools-claim-jiro-cu" + mountPath: "/opt/tools" + readOnly: true + - configMapVolume: + configMapName: "known-hosts" + mountPath: "/home/jenkins/.ssh/" + subPath: "." + - emptyDirVolume: + memory: false + mountPath: "/home/jenkins/" + - emptyDirVolume: + memory: false + mountPath: "/home/jenkins/.m2/repository" + - emptyDirVolume: + memory: false + mountPath: "/home/jenkins/.m2/wrapper" + workspaceVolume: + emptyDirWorkspaceVolume: + memory: false + yaml: | + apiVersion: v1 + kind: Pod + spec: + containers: + - name: jnlp + resources: + limits: + cpu: "2000m" + memory: "4096Mi" + requests: + cpu: "1000m" + memory: "4096Mi" + volumeMounts: + - name: m2-secret-dir + mountPath: /home/jenkins/.m2/settings-security.xml + subPath: settings-security.xml + readOnly: true + - name: m2-secret-dir + mountPath: /home/jenkins/.m2/settings.xml + subPath: settings.xml + readOnly: true + - name: m2-dir + mountPath: /home/jenkins/.m2/toolchains.xml + subPath: toolchains.xml + readOnly: true + - name: m2-dir + mountPath: /home/jenkins/.mavenrc + subPath: .mavenrc + readOnly: true + volumes: + - name: m2-secret-dir + secret: + secretName: m2-secret-dir + - name: m2-dir + configMap: + name: m2-dir + inheritYamlMergeStrategy: "true" + yamlMergeStrategy: "merge" security: apiToken: creationOfLegacyTokenEnabled: false @@ -602,6 +784,8 @@ data: home: "/opt/tools/java/openjdk/latest" - name: "openjdk-ea-latest" home: "/opt/tools/java/openjdk/ea-latest" + - name: "openjdk-jdk24-latest" + home: "/opt/tools/java/openjdk/jdk-24/latest" - name: "openjdk-jdk23-latest" home: "/opt/tools/java/openjdk/jdk-23/latest" - name: "openjdk-jdk22-latest" @@ -731,6 +915,8 @@ data: installations: - name: "apache-maven-latest" home: "/opt/tools/apache-maven/latest" + - name: "apache-maven-3.9.9" + home: "/opt/tools/apache-maven/3.9.9" - name: "apache-maven-3.9.6" home: "/opt/tools/apache-maven/3.9.6" - name: "apache-maven-3.9.5" diff --git a/instances/ee4j.cu/target/k8s/m2-dir.json b/instances/ee4j.cu/target/k8s/m2-dir.json index 1083b77c0..022e3b36b 100644 --- a/instances/ee4j.cu/target/k8s/m2-dir.json +++ b/instances/ee4j.cu/target/k8s/m2-dir.json @@ -2,7 +2,7 @@ "apiVersion": "v1", "data": { ".mavenrc": "set -- -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn --batch-mode \"${@}\"", - "toolchains.xml": "\n\n \n jdk\n \n JavaSE-1.8\n 1.8\n oracle\n \n /opt/tools/java/oracle/jdk-8/latest\n \n \n jdk\n \n JavaSE-9\n 9\n openjdk\n \n /opt/tools/java/openjdk/jdk-9/latest\n \n \n jdk\n \n JavaSE-10\n 10\n openjdk\n \n /opt/tools/java/openjdk/jdk-10/latest\n \n \n jdk\n \n JavaSE-11\n 11\n openjdk\n \n /opt/tools/java/openjdk/jdk-11/latest\n \n \n jdk\n \n JavaSE-12\n 12\n openjdk\n \n /opt/tools/java/openjdk/jdk-12/latest\n \n \n jdk\n \n JavaSE-13\n 13\n openjdk\n \n /opt/tools/java/openjdk/jdk-13/latest\n \n \n jdk\n \n JavaSE-14\n 14\n openjdk\n \n /opt/tools/java/openjdk/jdk-14/latest\n \n \n jdk\n \n JavaSE-15\n 15\n openjdk\n \n /opt/tools/java/openjdk/jdk-15/latest\n \n \n jdk\n \n JavaSE-16\n 16\n openjdk\n \n /opt/tools/java/openjdk/jdk-16/latest\n \n \n jdk\n \n JavaSE-17\n 17\n openjdk\n \n /opt/tools/java/openjdk/jdk-17/latest\n \n \n jdk\n \n JavaSE-18\n 18\n openjdk\n \n /opt/tools/java/openjdk/jdk-18/latest\n \n \n jdk\n \n JavaSE-19\n 19\n openjdk\n \n /opt/tools/java/openjdk/jdk-19/latest\n \n \n jdk\n \n JavaSE-20\n 20\n openjdk\n \n /opt/tools/java/openjdk/jdk-20/latest\n \n \n jdk\n \n JavaSE-21\n 21\n openjdk\n \n /opt/tools/java/openjdk/jdk-21/latest\n \n \n jdk\n \n JavaSE-22\n 22\n openjdk\n \n /opt/tools/java/openjdk/jdk-22/latest\n \n \n jdk\n \n JavaSE-23\n 23\n openjdk\n \n /opt/tools/java/openjdk/jdk-23/latest\n \n\n" + "toolchains.xml": "\n\n \n jdk\n \n JavaSE-1.8\n 1.8\n oracle\n \n /opt/tools/java/oracle/jdk-8/latest\n \n \n jdk\n \n JavaSE-9\n 9\n openjdk\n \n /opt/tools/java/openjdk/jdk-9/latest\n \n \n jdk\n \n JavaSE-10\n 10\n openjdk\n \n /opt/tools/java/openjdk/jdk-10/latest\n \n \n jdk\n \n JavaSE-11\n 11\n openjdk\n \n /opt/tools/java/openjdk/jdk-11/latest\n \n \n jdk\n \n JavaSE-12\n 12\n openjdk\n \n /opt/tools/java/openjdk/jdk-12/latest\n \n \n jdk\n \n JavaSE-13\n 13\n openjdk\n \n /opt/tools/java/openjdk/jdk-13/latest\n \n \n jdk\n \n JavaSE-14\n 14\n openjdk\n \n /opt/tools/java/openjdk/jdk-14/latest\n \n \n jdk\n \n JavaSE-15\n 15\n openjdk\n \n /opt/tools/java/openjdk/jdk-15/latest\n \n \n jdk\n \n JavaSE-16\n 16\n openjdk\n \n /opt/tools/java/openjdk/jdk-16/latest\n \n \n jdk\n \n JavaSE-17\n 17\n openjdk\n \n /opt/tools/java/openjdk/jdk-17/latest\n \n \n jdk\n \n JavaSE-18\n 18\n openjdk\n \n /opt/tools/java/openjdk/jdk-18/latest\n \n \n jdk\n \n JavaSE-19\n 19\n openjdk\n \n /opt/tools/java/openjdk/jdk-19/latest\n \n \n jdk\n \n JavaSE-20\n 20\n openjdk\n \n /opt/tools/java/openjdk/jdk-20/latest\n \n \n jdk\n \n JavaSE-21\n 21\n openjdk\n \n /opt/tools/java/openjdk/jdk-21/latest\n \n \n jdk\n \n JavaSE-22\n 22\n openjdk\n \n /opt/tools/java/openjdk/jdk-22/latest\n \n \n jdk\n \n JavaSE-23\n 23\n openjdk\n \n /opt/tools/java/openjdk/jdk-23/latest\n \n \n jdk\n \n JavaSE-24\n 24\n openjdk\n \n /opt/tools/java/openjdk/jdk-24/latest\n \n\n" }, "kind": "ConfigMap", "metadata": { diff --git a/instances/ee4j.cu/target/k8s/statefulset.json b/instances/ee4j.cu/target/k8s/statefulset.json index 84ba0e81a..7a70c5ccd 100644 --- a/instances/ee4j.cu/target/k8s/statefulset.json +++ b/instances/ee4j.cu/target/k8s/statefulset.json @@ -119,6 +119,12 @@ "cpu": "250m" } }, + "securityContext": { + "seLinuxOptions": { + "level": "s0:c34,c4", + "type": "spc_t" + } + }, "volumeMounts": [ { "mountPath": "/var/jenkins", diff --git a/instances/ee4j.data/config.jsonnet b/instances/ee4j.data/config.jsonnet index de842e333..e09aba97d 100644 --- a/instances/ee4j.data/config.jsonnet +++ b/instances/ee4j.data/config.jsonnet @@ -2,5 +2,6 @@ project+: { fullName: "ee4j.data", displayName: "Jakarta Data", - } + }, + seLinuxLevel: "s0:c59,c29", } diff --git a/instances/ee4j.data/target/config.json b/instances/ee4j.data/target/config.json index bda5d142b..84509768c 100644 --- a/instances/ee4j.data/target/config.json +++ b/instances/ee4j.data/target/config.json @@ -217,7 +217,7 @@ "docker.io/eclipsecbi/jiro-agent-centos-7:latest" ], "context": "centos-7", - "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-centos-7: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 [ \"uid_entrypoint\", \"/usr/local/bin/jenkins-agent\" ]\n\nADD \"https://repo.jenkins-ci.org/public/org/jenkins-ci/main/remoting/3206.3208.v409508a_675ff/remoting-3206.3208.v409508a_675ff.jar\" \"/usr/share/jenkins/agent.jar\" \nADD \"https://github.com/jenkinsci/docker-agent/raw/3206.vb_15dcf73f6a_9-12/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\nUSER 10001:0\n", + "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-centos-7: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/3206.3208.v409508a_675ff/remoting-3206.3208.v409508a_675ff.jar\" \"/usr/share/jenkins/agent.jar\"\nADD \"https://github.com/jenkinsci/docker-agent/raw/3206.vb_15dcf73f6a_9-12/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\nUSER 10001:0\n", "image": "jiro-agent-centos-7", "registry": "docker.io", "repository": "eclipsecbi", @@ -316,7 +316,7 @@ "docker.io/eclipsecbi/jiro-agent-centos-8:latest" ], "context": "centos-8", - "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-centos-8: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 [ \"uid_entrypoint\", \"/usr/local/bin/jenkins-agent\" ]\n\nADD \"https://repo.jenkins-ci.org/public/org/jenkins-ci/main/remoting/3206.3208.v409508a_675ff/remoting-3206.3208.v409508a_675ff.jar\" \"/usr/share/jenkins/agent.jar\" \nADD \"https://github.com/jenkinsci/docker-agent/raw/3206.vb_15dcf73f6a_9-12/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\nUSER 10001:0\n", + "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-centos-8: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/3206.3208.v409508a_675ff/remoting-3206.3208.v409508a_675ff.jar\" \"/usr/share/jenkins/agent.jar\"\nADD \"https://github.com/jenkinsci/docker-agent/raw/3206.vb_15dcf73f6a_9-12/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\nUSER 10001:0\n", "image": "jiro-agent-centos-8", "registry": "docker.io", "repository": "eclipsecbi", @@ -406,6 +406,203 @@ }, "startupScript": "/usr/local/bin/jenkins-agent", "username": "jenkins" + }, + "ubuntu-2204": { + "agentWorkdir": "/home/jenkins/jenkins-agent", + "docker": { + "aliases": [ + "docker.io/eclipsecbi/jiro-agent-ubuntu-2204:latest" + ], + "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-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/3206.3208.v409508a_675ff/remoting-3206.3208.v409508a_675ff.jar\" \"/usr/share/jenkins/agent.jar\"\nADD \"https://github.com/jenkinsci/docker-agent/raw/3206.vb_15dcf73f6a_9-12/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\nUSER 10001:0\n", + "image": "jiro-agent-ubuntu-2204", + "registry": "docker.io", + "repository": "eclipsecbi", + "tag": "remoting-3206.3208.v409508a_675ff" + }, + "env": { + "JAVA_TOOL_OPTIONS": [ ], + "JENKINS_REMOTING_JAVA_OPTS": [ + "-showversion", + "-XshowSettings:vm", + "-Xmx256m", + "-Dorg.jenkinsci.remoting.engine.JnlpProtocol3.disabled=true", + "-Dorg.jenkinsci.plugins.gitclient.CliGitAPIImpl.useSETSID=true" + ], + "OPENJ9_JAVA_OPTIONS": [ + "-XX:+IgnoreUnrecognizedVMOptions", + "-XX:+IdleTuningCompactOnIdle", + "-XX:+IdleTuningGcOnIdle" + ], + "_JAVA_OPTIONS": [ ] + }, + "home": "/home/jenkins", + "kubernetes": { + "inheritYamlMergeStrategy": true, + "resources": { + "cpu": { + "limit": "2000m", + "request": "1000m" + }, + "memory": { + "limit": "4096Mi", + "request": "4096Mi" + } + }, + "volumes": [ + { + "mounts": [ + { + "mountPath": "/home/jenkins/.m2/settings-security.xml", + "subPath": "settings-security.xml" + }, + { + "mountPath": "/home/jenkins/.m2/settings.xml", + "subPath": "settings.xml" + } + ], + "name": "m2-secret-dir", + "secret": { + "name": "m2-secret-dir" + } + }, + { + "configMap": { + "name": "m2-dir" + }, + "mounts": [ + { + "mountPath": "/home/jenkins/.m2/toolchains.xml", + "subPath": "toolchains.xml" + }, + { + "mountPath": "/home/jenkins/.mavenrc", + "subPath": ".mavenrc" + } + ], + "name": "m2-dir" + } + ], + "yamlMergeStrategy": "merge" + }, + "labels": [ + "ubuntu-2204" + ], + "maxHeap": "256m", + "mode": "EXCLUSIVE", + "name": "ubuntu-2204", + "remoting": { + "jar": "/usr/share/jenkins/agent.jar", + "startupScript": { + "name": "jenkins-agent", + "url": "https://github.com/jenkinsci/docker-agent/raw/3206.vb_15dcf73f6a_9-12/jenkins-agent", + "version": "3206.vb_15dcf73f6a_9-12" + }, + "url": "https://repo.jenkins-ci.org/public/org/jenkins-ci/main/remoting/3206.3208.v409508a_675ff/remoting-3206.3208.v409508a_675ff.jar", + "version": "3206.3208.v409508a_675ff" + }, + "startupScript": "/usr/local/bin/jenkins-agent", + "username": "jenkins" + }, + "ubuntu-2404": { + "agentWorkdir": "/home/jenkins/jenkins-agent", + "docker": { + "aliases": [ + "docker.io/eclipsecbi/jiro-agent-ubuntu-2404:latest" + ], + "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-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/3206.3208.v409508a_675ff/remoting-3206.3208.v409508a_675ff.jar\" \"/usr/share/jenkins/agent.jar\"\nADD \"https://github.com/jenkinsci/docker-agent/raw/3206.vb_15dcf73f6a_9-12/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\nUSER 10001:0\n", + "image": "jiro-agent-ubuntu-2404", + "registry": "docker.io", + "repository": "eclipsecbi", + "tag": "remoting-3206.3208.v409508a_675ff" + }, + "env": { + "JAVA_TOOL_OPTIONS": [ ], + "JENKINS_REMOTING_JAVA_OPTS": [ + "-showversion", + "-XshowSettings:vm", + "-Xmx256m", + "-Dorg.jenkinsci.remoting.engine.JnlpProtocol3.disabled=true", + "-Dorg.jenkinsci.plugins.gitclient.CliGitAPIImpl.useSETSID=true" + ], + "OPENJ9_JAVA_OPTIONS": [ + "-XX:+IgnoreUnrecognizedVMOptions", + "-XX:+IdleTuningCompactOnIdle", + "-XX:+IdleTuningGcOnIdle" + ], + "_JAVA_OPTIONS": [ ] + }, + "home": "/home/jenkins", + "kubernetes": { + "inheritYamlMergeStrategy": true, + "resources": { + "cpu": { + "limit": "2000m", + "request": "1000m" + }, + "memory": { + "limit": "4096Mi", + "request": "4096Mi" + } + }, + "volumes": [ + { + "mounts": [ + { + "mountPath": "/home/jenkins/.m2/settings-security.xml", + "subPath": "settings-security.xml" + }, + { + "mountPath": "/home/jenkins/.m2/settings.xml", + "subPath": "settings.xml" + } + ], + "name": "m2-secret-dir", + "secret": { + "name": "m2-secret-dir" + } + }, + { + "configMap": { + "name": "m2-dir" + }, + "mounts": [ + { + "mountPath": "/home/jenkins/.m2/toolchains.xml", + "subPath": "toolchains.xml" + }, + { + "mountPath": "/home/jenkins/.mavenrc", + "subPath": ".mavenrc" + } + ], + "name": "m2-dir" + } + ], + "yamlMergeStrategy": "merge" + }, + "labels": [ + "ubuntu-latest", + "ubuntu-2404" + ], + "maxHeap": "256m", + "mode": "EXCLUSIVE", + "name": "ubuntu-2404", + "remoting": { + "jar": "/usr/share/jenkins/agent.jar", + "startupScript": { + "name": "jenkins-agent", + "url": "https://github.com/jenkinsci/docker-agent/raw/3206.vb_15dcf73f6a_9-12/jenkins-agent", + "version": "3206.vb_15dcf73f6a_9-12" + }, + "url": "https://repo.jenkins-ci.org/public/org/jenkins-ci/main/remoting/3206.3208.v409508a_675ff/remoting-3206.3208.v409508a_675ff.jar", + "version": "3206.3208.v409508a_675ff" + }, + "startupScript": "/usr/local/bin/jenkins-agent", + "username": "jenkins" } } } @@ -753,6 +950,7 @@ }, "generate": false }, + "seLinuxLevel": "s0:c59,c29", "secrets": { "dockerconfigjson": { "dockerconfigjson-for-pull-as-data": { diff --git a/instances/ee4j.data/target/jenkins/configuration.yml b/instances/ee4j.data/target/jenkins/configuration.yml index a83372595..a5c0558d4 100644 --- a/instances/ee4j.data/target/jenkins/configuration.yml +++ b/instances/ee4j.data/target/jenkins/configuration.yml @@ -485,6 +485,188 @@ jenkins: name: m2-dir inheritYamlMergeStrategy: "true" yamlMergeStrategy: "merge" + - name: "ubuntu-2204" + namespace: "data" + label: "ubuntu-2204" + containers: + - name: "jnlp" + image: docker.io/eclipsecbi/jiro-agent-ubuntu-2204:remoting-3206.3208.v409508a_675ff + alwaysPullImage: true + livenessProbe: + failureThreshold: 0 + initialDelaySeconds: 0 + periodSeconds: 0 + successThreshold: 0 + timeoutSeconds: 0 + ttyEnabled: true + command: "" + args: "" + instanceCap: -1 + nodeUsageMode: EXCLUSIVE + envVars: + - envVar: + key: "JAVA_TOOL_OPTIONS" + 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" + - envVar: + key: "OPENJ9_JAVA_OPTIONS" + value: "-XX:+IgnoreUnrecognizedVMOptions -XX:+IdleTuningCompactOnIdle -XX:+IdleTuningGcOnIdle" + - envVar: + key: "_JAVA_OPTIONS" + value: "" + volumes: + - persistentVolumeClaim: + claimName: "tools-claim-jiro-data" + mountPath: "/opt/tools" + readOnly: true + - configMapVolume: + configMapName: "known-hosts" + mountPath: "/home/jenkins/.ssh/" + subPath: "." + - emptyDirVolume: + memory: false + mountPath: "/home/jenkins/" + - emptyDirVolume: + memory: false + mountPath: "/home/jenkins/.m2/repository" + - emptyDirVolume: + memory: false + mountPath: "/home/jenkins/.m2/wrapper" + workspaceVolume: + emptyDirWorkspaceVolume: + memory: false + yaml: | + apiVersion: v1 + kind: Pod + spec: + containers: + - name: jnlp + resources: + limits: + cpu: "2000m" + memory: "4096Mi" + requests: + cpu: "1000m" + memory: "4096Mi" + volumeMounts: + - name: m2-secret-dir + mountPath: /home/jenkins/.m2/settings-security.xml + subPath: settings-security.xml + readOnly: true + - name: m2-secret-dir + mountPath: /home/jenkins/.m2/settings.xml + subPath: settings.xml + readOnly: true + - name: m2-dir + mountPath: /home/jenkins/.m2/toolchains.xml + subPath: toolchains.xml + readOnly: true + - name: m2-dir + mountPath: /home/jenkins/.mavenrc + subPath: .mavenrc + readOnly: true + volumes: + - name: m2-secret-dir + secret: + secretName: m2-secret-dir + - name: m2-dir + configMap: + name: m2-dir + inheritYamlMergeStrategy: "true" + yamlMergeStrategy: "merge" + - name: "ubuntu-2404" + namespace: "data" + label: "ubuntu-latest ubuntu-2404" + containers: + - name: "jnlp" + image: docker.io/eclipsecbi/jiro-agent-ubuntu-2404:remoting-3206.3208.v409508a_675ff + alwaysPullImage: true + livenessProbe: + failureThreshold: 0 + initialDelaySeconds: 0 + periodSeconds: 0 + successThreshold: 0 + timeoutSeconds: 0 + ttyEnabled: true + command: "" + args: "" + instanceCap: -1 + nodeUsageMode: EXCLUSIVE + envVars: + - envVar: + key: "JAVA_TOOL_OPTIONS" + 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" + - envVar: + key: "OPENJ9_JAVA_OPTIONS" + value: "-XX:+IgnoreUnrecognizedVMOptions -XX:+IdleTuningCompactOnIdle -XX:+IdleTuningGcOnIdle" + - envVar: + key: "_JAVA_OPTIONS" + value: "" + volumes: + - persistentVolumeClaim: + claimName: "tools-claim-jiro-data" + mountPath: "/opt/tools" + readOnly: true + - configMapVolume: + configMapName: "known-hosts" + mountPath: "/home/jenkins/.ssh/" + subPath: "." + - emptyDirVolume: + memory: false + mountPath: "/home/jenkins/" + - emptyDirVolume: + memory: false + mountPath: "/home/jenkins/.m2/repository" + - emptyDirVolume: + memory: false + mountPath: "/home/jenkins/.m2/wrapper" + workspaceVolume: + emptyDirWorkspaceVolume: + memory: false + yaml: | + apiVersion: v1 + kind: Pod + spec: + containers: + - name: jnlp + resources: + limits: + cpu: "2000m" + memory: "4096Mi" + requests: + cpu: "1000m" + memory: "4096Mi" + volumeMounts: + - name: m2-secret-dir + mountPath: /home/jenkins/.m2/settings-security.xml + subPath: settings-security.xml + readOnly: true + - name: m2-secret-dir + mountPath: /home/jenkins/.m2/settings.xml + subPath: settings.xml + readOnly: true + - name: m2-dir + mountPath: /home/jenkins/.m2/toolchains.xml + subPath: toolchains.xml + readOnly: true + - name: m2-dir + mountPath: /home/jenkins/.mavenrc + subPath: .mavenrc + readOnly: true + volumes: + - name: m2-secret-dir + secret: + secretName: m2-secret-dir + - name: m2-dir + configMap: + name: m2-dir + inheritYamlMergeStrategy: "true" + yamlMergeStrategy: "merge" security: apiToken: creationOfLegacyTokenEnabled: false @@ -579,6 +761,8 @@ tool: home: "/opt/tools/java/openjdk/latest" - name: "openjdk-ea-latest" home: "/opt/tools/java/openjdk/ea-latest" + - name: "openjdk-jdk24-latest" + home: "/opt/tools/java/openjdk/jdk-24/latest" - name: "openjdk-jdk23-latest" home: "/opt/tools/java/openjdk/jdk-23/latest" - name: "openjdk-jdk22-latest" @@ -708,6 +892,8 @@ tool: installations: - name: "apache-maven-latest" home: "/opt/tools/apache-maven/latest" + - name: "apache-maven-3.9.9" + home: "/opt/tools/apache-maven/3.9.9" - name: "apache-maven-3.9.6" home: "/opt/tools/apache-maven/3.9.6" - name: "apache-maven-3.9.5" diff --git a/instances/ee4j.data/target/k8s/configmap-jenkins-config.yml b/instances/ee4j.data/target/k8s/configmap-jenkins-config.yml index e3332f24d..82d06b006 100644 --- a/instances/ee4j.data/target/k8s/configmap-jenkins-config.yml +++ b/instances/ee4j.data/target/k8s/configmap-jenkins-config.yml @@ -508,6 +508,188 @@ data: name: m2-dir inheritYamlMergeStrategy: "true" yamlMergeStrategy: "merge" + - name: "ubuntu-2204" + namespace: "data" + label: "ubuntu-2204" + containers: + - name: "jnlp" + image: docker.io/eclipsecbi/jiro-agent-ubuntu-2204:remoting-3206.3208.v409508a_675ff + alwaysPullImage: true + livenessProbe: + failureThreshold: 0 + initialDelaySeconds: 0 + periodSeconds: 0 + successThreshold: 0 + timeoutSeconds: 0 + ttyEnabled: true + command: "" + args: "" + instanceCap: -1 + nodeUsageMode: EXCLUSIVE + envVars: + - envVar: + key: "JAVA_TOOL_OPTIONS" + 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" + - envVar: + key: "OPENJ9_JAVA_OPTIONS" + value: "-XX:+IgnoreUnrecognizedVMOptions -XX:+IdleTuningCompactOnIdle -XX:+IdleTuningGcOnIdle" + - envVar: + key: "_JAVA_OPTIONS" + value: "" + volumes: + - persistentVolumeClaim: + claimName: "tools-claim-jiro-data" + mountPath: "/opt/tools" + readOnly: true + - configMapVolume: + configMapName: "known-hosts" + mountPath: "/home/jenkins/.ssh/" + subPath: "." + - emptyDirVolume: + memory: false + mountPath: "/home/jenkins/" + - emptyDirVolume: + memory: false + mountPath: "/home/jenkins/.m2/repository" + - emptyDirVolume: + memory: false + mountPath: "/home/jenkins/.m2/wrapper" + workspaceVolume: + emptyDirWorkspaceVolume: + memory: false + yaml: | + apiVersion: v1 + kind: Pod + spec: + containers: + - name: jnlp + resources: + limits: + cpu: "2000m" + memory: "4096Mi" + requests: + cpu: "1000m" + memory: "4096Mi" + volumeMounts: + - name: m2-secret-dir + mountPath: /home/jenkins/.m2/settings-security.xml + subPath: settings-security.xml + readOnly: true + - name: m2-secret-dir + mountPath: /home/jenkins/.m2/settings.xml + subPath: settings.xml + readOnly: true + - name: m2-dir + mountPath: /home/jenkins/.m2/toolchains.xml + subPath: toolchains.xml + readOnly: true + - name: m2-dir + mountPath: /home/jenkins/.mavenrc + subPath: .mavenrc + readOnly: true + volumes: + - name: m2-secret-dir + secret: + secretName: m2-secret-dir + - name: m2-dir + configMap: + name: m2-dir + inheritYamlMergeStrategy: "true" + yamlMergeStrategy: "merge" + - name: "ubuntu-2404" + namespace: "data" + label: "ubuntu-latest ubuntu-2404" + containers: + - name: "jnlp" + image: docker.io/eclipsecbi/jiro-agent-ubuntu-2404:remoting-3206.3208.v409508a_675ff + alwaysPullImage: true + livenessProbe: + failureThreshold: 0 + initialDelaySeconds: 0 + periodSeconds: 0 + successThreshold: 0 + timeoutSeconds: 0 + ttyEnabled: true + command: "" + args: "" + instanceCap: -1 + nodeUsageMode: EXCLUSIVE + envVars: + - envVar: + key: "JAVA_TOOL_OPTIONS" + 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" + - envVar: + key: "OPENJ9_JAVA_OPTIONS" + value: "-XX:+IgnoreUnrecognizedVMOptions -XX:+IdleTuningCompactOnIdle -XX:+IdleTuningGcOnIdle" + - envVar: + key: "_JAVA_OPTIONS" + value: "" + volumes: + - persistentVolumeClaim: + claimName: "tools-claim-jiro-data" + mountPath: "/opt/tools" + readOnly: true + - configMapVolume: + configMapName: "known-hosts" + mountPath: "/home/jenkins/.ssh/" + subPath: "." + - emptyDirVolume: + memory: false + mountPath: "/home/jenkins/" + - emptyDirVolume: + memory: false + mountPath: "/home/jenkins/.m2/repository" + - emptyDirVolume: + memory: false + mountPath: "/home/jenkins/.m2/wrapper" + workspaceVolume: + emptyDirWorkspaceVolume: + memory: false + yaml: | + apiVersion: v1 + kind: Pod + spec: + containers: + - name: jnlp + resources: + limits: + cpu: "2000m" + memory: "4096Mi" + requests: + cpu: "1000m" + memory: "4096Mi" + volumeMounts: + - name: m2-secret-dir + mountPath: /home/jenkins/.m2/settings-security.xml + subPath: settings-security.xml + readOnly: true + - name: m2-secret-dir + mountPath: /home/jenkins/.m2/settings.xml + subPath: settings.xml + readOnly: true + - name: m2-dir + mountPath: /home/jenkins/.m2/toolchains.xml + subPath: toolchains.xml + readOnly: true + - name: m2-dir + mountPath: /home/jenkins/.mavenrc + subPath: .mavenrc + readOnly: true + volumes: + - name: m2-secret-dir + secret: + secretName: m2-secret-dir + - name: m2-dir + configMap: + name: m2-dir + inheritYamlMergeStrategy: "true" + yamlMergeStrategy: "merge" security: apiToken: creationOfLegacyTokenEnabled: false @@ -602,6 +784,8 @@ data: home: "/opt/tools/java/openjdk/latest" - name: "openjdk-ea-latest" home: "/opt/tools/java/openjdk/ea-latest" + - name: "openjdk-jdk24-latest" + home: "/opt/tools/java/openjdk/jdk-24/latest" - name: "openjdk-jdk23-latest" home: "/opt/tools/java/openjdk/jdk-23/latest" - name: "openjdk-jdk22-latest" @@ -731,6 +915,8 @@ data: installations: - name: "apache-maven-latest" home: "/opt/tools/apache-maven/latest" + - name: "apache-maven-3.9.9" + home: "/opt/tools/apache-maven/3.9.9" - name: "apache-maven-3.9.6" home: "/opt/tools/apache-maven/3.9.6" - name: "apache-maven-3.9.5" diff --git a/instances/ee4j.data/target/k8s/m2-dir.json b/instances/ee4j.data/target/k8s/m2-dir.json index 076671acd..7971de267 100644 --- a/instances/ee4j.data/target/k8s/m2-dir.json +++ b/instances/ee4j.data/target/k8s/m2-dir.json @@ -2,7 +2,7 @@ "apiVersion": "v1", "data": { ".mavenrc": "set -- -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn --batch-mode \"${@}\"", - "toolchains.xml": "\n\n \n jdk\n \n JavaSE-1.8\n 1.8\n oracle\n \n /opt/tools/java/oracle/jdk-8/latest\n \n \n jdk\n \n JavaSE-9\n 9\n openjdk\n \n /opt/tools/java/openjdk/jdk-9/latest\n \n \n jdk\n \n JavaSE-10\n 10\n openjdk\n \n /opt/tools/java/openjdk/jdk-10/latest\n \n \n jdk\n \n JavaSE-11\n 11\n openjdk\n \n /opt/tools/java/openjdk/jdk-11/latest\n \n \n jdk\n \n JavaSE-12\n 12\n openjdk\n \n /opt/tools/java/openjdk/jdk-12/latest\n \n \n jdk\n \n JavaSE-13\n 13\n openjdk\n \n /opt/tools/java/openjdk/jdk-13/latest\n \n \n jdk\n \n JavaSE-14\n 14\n openjdk\n \n /opt/tools/java/openjdk/jdk-14/latest\n \n \n jdk\n \n JavaSE-15\n 15\n openjdk\n \n /opt/tools/java/openjdk/jdk-15/latest\n \n \n jdk\n \n JavaSE-16\n 16\n openjdk\n \n /opt/tools/java/openjdk/jdk-16/latest\n \n \n jdk\n \n JavaSE-17\n 17\n openjdk\n \n /opt/tools/java/openjdk/jdk-17/latest\n \n \n jdk\n \n JavaSE-18\n 18\n openjdk\n \n /opt/tools/java/openjdk/jdk-18/latest\n \n \n jdk\n \n JavaSE-19\n 19\n openjdk\n \n /opt/tools/java/openjdk/jdk-19/latest\n \n \n jdk\n \n JavaSE-20\n 20\n openjdk\n \n /opt/tools/java/openjdk/jdk-20/latest\n \n \n jdk\n \n JavaSE-21\n 21\n openjdk\n \n /opt/tools/java/openjdk/jdk-21/latest\n \n \n jdk\n \n JavaSE-22\n 22\n openjdk\n \n /opt/tools/java/openjdk/jdk-22/latest\n \n \n jdk\n \n JavaSE-23\n 23\n openjdk\n \n /opt/tools/java/openjdk/jdk-23/latest\n \n\n" + "toolchains.xml": "\n\n \n jdk\n \n JavaSE-1.8\n 1.8\n oracle\n \n /opt/tools/java/oracle/jdk-8/latest\n \n \n jdk\n \n JavaSE-9\n 9\n openjdk\n \n /opt/tools/java/openjdk/jdk-9/latest\n \n \n jdk\n \n JavaSE-10\n 10\n openjdk\n \n /opt/tools/java/openjdk/jdk-10/latest\n \n \n jdk\n \n JavaSE-11\n 11\n openjdk\n \n /opt/tools/java/openjdk/jdk-11/latest\n \n \n jdk\n \n JavaSE-12\n 12\n openjdk\n \n /opt/tools/java/openjdk/jdk-12/latest\n \n \n jdk\n \n JavaSE-13\n 13\n openjdk\n \n /opt/tools/java/openjdk/jdk-13/latest\n \n \n jdk\n \n JavaSE-14\n 14\n openjdk\n \n /opt/tools/java/openjdk/jdk-14/latest\n \n \n jdk\n \n JavaSE-15\n 15\n openjdk\n \n /opt/tools/java/openjdk/jdk-15/latest\n \n \n jdk\n \n JavaSE-16\n 16\n openjdk\n \n /opt/tools/java/openjdk/jdk-16/latest\n \n \n jdk\n \n JavaSE-17\n 17\n openjdk\n \n /opt/tools/java/openjdk/jdk-17/latest\n \n \n jdk\n \n JavaSE-18\n 18\n openjdk\n \n /opt/tools/java/openjdk/jdk-18/latest\n \n \n jdk\n \n JavaSE-19\n 19\n openjdk\n \n /opt/tools/java/openjdk/jdk-19/latest\n \n \n jdk\n \n JavaSE-20\n 20\n openjdk\n \n /opt/tools/java/openjdk/jdk-20/latest\n \n \n jdk\n \n JavaSE-21\n 21\n openjdk\n \n /opt/tools/java/openjdk/jdk-21/latest\n \n \n jdk\n \n JavaSE-22\n 22\n openjdk\n \n /opt/tools/java/openjdk/jdk-22/latest\n \n \n jdk\n \n JavaSE-23\n 23\n openjdk\n \n /opt/tools/java/openjdk/jdk-23/latest\n \n \n jdk\n \n JavaSE-24\n 24\n openjdk\n \n /opt/tools/java/openjdk/jdk-24/latest\n \n\n" }, "kind": "ConfigMap", "metadata": { diff --git a/instances/ee4j.data/target/k8s/statefulset.json b/instances/ee4j.data/target/k8s/statefulset.json index f75f5fece..779157b87 100644 --- a/instances/ee4j.data/target/k8s/statefulset.json +++ b/instances/ee4j.data/target/k8s/statefulset.json @@ -119,6 +119,12 @@ "cpu": "250m" } }, + "securityContext": { + "seLinuxOptions": { + "level": "s0:c59,c29", + "type": "spc_t" + } + }, "volumeMounts": [ { "mountPath": "/var/jenkins", diff --git a/instances/ee4j.ejb/config.jsonnet b/instances/ee4j.ejb/config.jsonnet index 37bd4b12f..78badcae4 100644 --- a/instances/ee4j.ejb/config.jsonnet +++ b/instances/ee4j.ejb/config.jsonnet @@ -8,4 +8,5 @@ "copyartifact", ], }, + seLinuxLevel: "s0:c37,c19", } diff --git a/instances/ee4j.ejb/target/config.json b/instances/ee4j.ejb/target/config.json index ff76203e5..06275f17e 100644 --- a/instances/ee4j.ejb/target/config.json +++ b/instances/ee4j.ejb/target/config.json @@ -217,7 +217,7 @@ "docker.io/eclipsecbi/jiro-agent-centos-7:latest" ], "context": "centos-7", - "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-centos-7: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 [ \"uid_entrypoint\", \"/usr/local/bin/jenkins-agent\" ]\n\nADD \"https://repo.jenkins-ci.org/public/org/jenkins-ci/main/remoting/3206.3208.v409508a_675ff/remoting-3206.3208.v409508a_675ff.jar\" \"/usr/share/jenkins/agent.jar\" \nADD \"https://github.com/jenkinsci/docker-agent/raw/3206.vb_15dcf73f6a_9-12/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\nUSER 10001:0\n", + "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-centos-7: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/3206.3208.v409508a_675ff/remoting-3206.3208.v409508a_675ff.jar\" \"/usr/share/jenkins/agent.jar\"\nADD \"https://github.com/jenkinsci/docker-agent/raw/3206.vb_15dcf73f6a_9-12/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\nUSER 10001:0\n", "image": "jiro-agent-centos-7", "registry": "docker.io", "repository": "eclipsecbi", @@ -316,7 +316,7 @@ "docker.io/eclipsecbi/jiro-agent-centos-8:latest" ], "context": "centos-8", - "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-centos-8: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 [ \"uid_entrypoint\", \"/usr/local/bin/jenkins-agent\" ]\n\nADD \"https://repo.jenkins-ci.org/public/org/jenkins-ci/main/remoting/3206.3208.v409508a_675ff/remoting-3206.3208.v409508a_675ff.jar\" \"/usr/share/jenkins/agent.jar\" \nADD \"https://github.com/jenkinsci/docker-agent/raw/3206.vb_15dcf73f6a_9-12/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\nUSER 10001:0\n", + "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-centos-8: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/3206.3208.v409508a_675ff/remoting-3206.3208.v409508a_675ff.jar\" \"/usr/share/jenkins/agent.jar\"\nADD \"https://github.com/jenkinsci/docker-agent/raw/3206.vb_15dcf73f6a_9-12/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\nUSER 10001:0\n", "image": "jiro-agent-centos-8", "registry": "docker.io", "repository": "eclipsecbi", @@ -406,6 +406,203 @@ }, "startupScript": "/usr/local/bin/jenkins-agent", "username": "jenkins" + }, + "ubuntu-2204": { + "agentWorkdir": "/home/jenkins/jenkins-agent", + "docker": { + "aliases": [ + "docker.io/eclipsecbi/jiro-agent-ubuntu-2204:latest" + ], + "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-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/3206.3208.v409508a_675ff/remoting-3206.3208.v409508a_675ff.jar\" \"/usr/share/jenkins/agent.jar\"\nADD \"https://github.com/jenkinsci/docker-agent/raw/3206.vb_15dcf73f6a_9-12/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\nUSER 10001:0\n", + "image": "jiro-agent-ubuntu-2204", + "registry": "docker.io", + "repository": "eclipsecbi", + "tag": "remoting-3206.3208.v409508a_675ff" + }, + "env": { + "JAVA_TOOL_OPTIONS": [ ], + "JENKINS_REMOTING_JAVA_OPTS": [ + "-showversion", + "-XshowSettings:vm", + "-Xmx256m", + "-Dorg.jenkinsci.remoting.engine.JnlpProtocol3.disabled=true", + "-Dorg.jenkinsci.plugins.gitclient.CliGitAPIImpl.useSETSID=true" + ], + "OPENJ9_JAVA_OPTIONS": [ + "-XX:+IgnoreUnrecognizedVMOptions", + "-XX:+IdleTuningCompactOnIdle", + "-XX:+IdleTuningGcOnIdle" + ], + "_JAVA_OPTIONS": [ ] + }, + "home": "/home/jenkins", + "kubernetes": { + "inheritYamlMergeStrategy": true, + "resources": { + "cpu": { + "limit": "2000m", + "request": "1000m" + }, + "memory": { + "limit": "4096Mi", + "request": "4096Mi" + } + }, + "volumes": [ + { + "mounts": [ + { + "mountPath": "/home/jenkins/.m2/settings-security.xml", + "subPath": "settings-security.xml" + }, + { + "mountPath": "/home/jenkins/.m2/settings.xml", + "subPath": "settings.xml" + } + ], + "name": "m2-secret-dir", + "secret": { + "name": "m2-secret-dir" + } + }, + { + "configMap": { + "name": "m2-dir" + }, + "mounts": [ + { + "mountPath": "/home/jenkins/.m2/toolchains.xml", + "subPath": "toolchains.xml" + }, + { + "mountPath": "/home/jenkins/.mavenrc", + "subPath": ".mavenrc" + } + ], + "name": "m2-dir" + } + ], + "yamlMergeStrategy": "merge" + }, + "labels": [ + "ubuntu-2204" + ], + "maxHeap": "256m", + "mode": "EXCLUSIVE", + "name": "ubuntu-2204", + "remoting": { + "jar": "/usr/share/jenkins/agent.jar", + "startupScript": { + "name": "jenkins-agent", + "url": "https://github.com/jenkinsci/docker-agent/raw/3206.vb_15dcf73f6a_9-12/jenkins-agent", + "version": "3206.vb_15dcf73f6a_9-12" + }, + "url": "https://repo.jenkins-ci.org/public/org/jenkins-ci/main/remoting/3206.3208.v409508a_675ff/remoting-3206.3208.v409508a_675ff.jar", + "version": "3206.3208.v409508a_675ff" + }, + "startupScript": "/usr/local/bin/jenkins-agent", + "username": "jenkins" + }, + "ubuntu-2404": { + "agentWorkdir": "/home/jenkins/jenkins-agent", + "docker": { + "aliases": [ + "docker.io/eclipsecbi/jiro-agent-ubuntu-2404:latest" + ], + "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-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/3206.3208.v409508a_675ff/remoting-3206.3208.v409508a_675ff.jar\" \"/usr/share/jenkins/agent.jar\"\nADD \"https://github.com/jenkinsci/docker-agent/raw/3206.vb_15dcf73f6a_9-12/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\nUSER 10001:0\n", + "image": "jiro-agent-ubuntu-2404", + "registry": "docker.io", + "repository": "eclipsecbi", + "tag": "remoting-3206.3208.v409508a_675ff" + }, + "env": { + "JAVA_TOOL_OPTIONS": [ ], + "JENKINS_REMOTING_JAVA_OPTS": [ + "-showversion", + "-XshowSettings:vm", + "-Xmx256m", + "-Dorg.jenkinsci.remoting.engine.JnlpProtocol3.disabled=true", + "-Dorg.jenkinsci.plugins.gitclient.CliGitAPIImpl.useSETSID=true" + ], + "OPENJ9_JAVA_OPTIONS": [ + "-XX:+IgnoreUnrecognizedVMOptions", + "-XX:+IdleTuningCompactOnIdle", + "-XX:+IdleTuningGcOnIdle" + ], + "_JAVA_OPTIONS": [ ] + }, + "home": "/home/jenkins", + "kubernetes": { + "inheritYamlMergeStrategy": true, + "resources": { + "cpu": { + "limit": "2000m", + "request": "1000m" + }, + "memory": { + "limit": "4096Mi", + "request": "4096Mi" + } + }, + "volumes": [ + { + "mounts": [ + { + "mountPath": "/home/jenkins/.m2/settings-security.xml", + "subPath": "settings-security.xml" + }, + { + "mountPath": "/home/jenkins/.m2/settings.xml", + "subPath": "settings.xml" + } + ], + "name": "m2-secret-dir", + "secret": { + "name": "m2-secret-dir" + } + }, + { + "configMap": { + "name": "m2-dir" + }, + "mounts": [ + { + "mountPath": "/home/jenkins/.m2/toolchains.xml", + "subPath": "toolchains.xml" + }, + { + "mountPath": "/home/jenkins/.mavenrc", + "subPath": ".mavenrc" + } + ], + "name": "m2-dir" + } + ], + "yamlMergeStrategy": "merge" + }, + "labels": [ + "ubuntu-latest", + "ubuntu-2404" + ], + "maxHeap": "256m", + "mode": "EXCLUSIVE", + "name": "ubuntu-2404", + "remoting": { + "jar": "/usr/share/jenkins/agent.jar", + "startupScript": { + "name": "jenkins-agent", + "url": "https://github.com/jenkinsci/docker-agent/raw/3206.vb_15dcf73f6a_9-12/jenkins-agent", + "version": "3206.vb_15dcf73f6a_9-12" + }, + "url": "https://repo.jenkins-ci.org/public/org/jenkins-ci/main/remoting/3206.3208.v409508a_675ff/remoting-3206.3208.v409508a_675ff.jar", + "version": "3206.3208.v409508a_675ff" + }, + "startupScript": "/usr/local/bin/jenkins-agent", + "username": "jenkins" } } } @@ -754,6 +951,7 @@ }, "generate": false }, + "seLinuxLevel": "s0:c37,c19", "secrets": { "dockerconfigjson": { "dockerconfigjson-for-pull-as-default": { diff --git a/instances/ee4j.ejb/target/jenkins/configuration.yml b/instances/ee4j.ejb/target/jenkins/configuration.yml index e154ea143..98a7cfb76 100644 --- a/instances/ee4j.ejb/target/jenkins/configuration.yml +++ b/instances/ee4j.ejb/target/jenkins/configuration.yml @@ -485,6 +485,188 @@ jenkins: name: m2-dir inheritYamlMergeStrategy: "true" yamlMergeStrategy: "merge" + - name: "ubuntu-2204" + namespace: "ejb" + label: "ubuntu-2204" + containers: + - name: "jnlp" + image: docker.io/eclipsecbi/jiro-agent-ubuntu-2204:remoting-3206.3208.v409508a_675ff + alwaysPullImage: true + livenessProbe: + failureThreshold: 0 + initialDelaySeconds: 0 + periodSeconds: 0 + successThreshold: 0 + timeoutSeconds: 0 + ttyEnabled: true + command: "" + args: "" + instanceCap: -1 + nodeUsageMode: EXCLUSIVE + envVars: + - envVar: + key: "JAVA_TOOL_OPTIONS" + 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" + - envVar: + key: "OPENJ9_JAVA_OPTIONS" + value: "-XX:+IgnoreUnrecognizedVMOptions -XX:+IdleTuningCompactOnIdle -XX:+IdleTuningGcOnIdle" + - envVar: + key: "_JAVA_OPTIONS" + value: "" + volumes: + - persistentVolumeClaim: + claimName: "tools-claim-jiro-ejb" + mountPath: "/opt/tools" + readOnly: true + - configMapVolume: + configMapName: "known-hosts" + mountPath: "/home/jenkins/.ssh/" + subPath: "." + - emptyDirVolume: + memory: false + mountPath: "/home/jenkins/" + - emptyDirVolume: + memory: false + mountPath: "/home/jenkins/.m2/repository" + - emptyDirVolume: + memory: false + mountPath: "/home/jenkins/.m2/wrapper" + workspaceVolume: + emptyDirWorkspaceVolume: + memory: false + yaml: | + apiVersion: v1 + kind: Pod + spec: + containers: + - name: jnlp + resources: + limits: + cpu: "2000m" + memory: "4096Mi" + requests: + cpu: "1000m" + memory: "4096Mi" + volumeMounts: + - name: m2-secret-dir + mountPath: /home/jenkins/.m2/settings-security.xml + subPath: settings-security.xml + readOnly: true + - name: m2-secret-dir + mountPath: /home/jenkins/.m2/settings.xml + subPath: settings.xml + readOnly: true + - name: m2-dir + mountPath: /home/jenkins/.m2/toolchains.xml + subPath: toolchains.xml + readOnly: true + - name: m2-dir + mountPath: /home/jenkins/.mavenrc + subPath: .mavenrc + readOnly: true + volumes: + - name: m2-secret-dir + secret: + secretName: m2-secret-dir + - name: m2-dir + configMap: + name: m2-dir + inheritYamlMergeStrategy: "true" + yamlMergeStrategy: "merge" + - name: "ubuntu-2404" + namespace: "ejb" + label: "ubuntu-latest ubuntu-2404" + containers: + - name: "jnlp" + image: docker.io/eclipsecbi/jiro-agent-ubuntu-2404:remoting-3206.3208.v409508a_675ff + alwaysPullImage: true + livenessProbe: + failureThreshold: 0 + initialDelaySeconds: 0 + periodSeconds: 0 + successThreshold: 0 + timeoutSeconds: 0 + ttyEnabled: true + command: "" + args: "" + instanceCap: -1 + nodeUsageMode: EXCLUSIVE + envVars: + - envVar: + key: "JAVA_TOOL_OPTIONS" + 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" + - envVar: + key: "OPENJ9_JAVA_OPTIONS" + value: "-XX:+IgnoreUnrecognizedVMOptions -XX:+IdleTuningCompactOnIdle -XX:+IdleTuningGcOnIdle" + - envVar: + key: "_JAVA_OPTIONS" + value: "" + volumes: + - persistentVolumeClaim: + claimName: "tools-claim-jiro-ejb" + mountPath: "/opt/tools" + readOnly: true + - configMapVolume: + configMapName: "known-hosts" + mountPath: "/home/jenkins/.ssh/" + subPath: "." + - emptyDirVolume: + memory: false + mountPath: "/home/jenkins/" + - emptyDirVolume: + memory: false + mountPath: "/home/jenkins/.m2/repository" + - emptyDirVolume: + memory: false + mountPath: "/home/jenkins/.m2/wrapper" + workspaceVolume: + emptyDirWorkspaceVolume: + memory: false + yaml: | + apiVersion: v1 + kind: Pod + spec: + containers: + - name: jnlp + resources: + limits: + cpu: "2000m" + memory: "4096Mi" + requests: + cpu: "1000m" + memory: "4096Mi" + volumeMounts: + - name: m2-secret-dir + mountPath: /home/jenkins/.m2/settings-security.xml + subPath: settings-security.xml + readOnly: true + - name: m2-secret-dir + mountPath: /home/jenkins/.m2/settings.xml + subPath: settings.xml + readOnly: true + - name: m2-dir + mountPath: /home/jenkins/.m2/toolchains.xml + subPath: toolchains.xml + readOnly: true + - name: m2-dir + mountPath: /home/jenkins/.mavenrc + subPath: .mavenrc + readOnly: true + volumes: + - name: m2-secret-dir + secret: + secretName: m2-secret-dir + - name: m2-dir + configMap: + name: m2-dir + inheritYamlMergeStrategy: "true" + yamlMergeStrategy: "merge" security: apiToken: creationOfLegacyTokenEnabled: false @@ -579,6 +761,8 @@ tool: home: "/opt/tools/java/openjdk/latest" - name: "openjdk-ea-latest" home: "/opt/tools/java/openjdk/ea-latest" + - name: "openjdk-jdk24-latest" + home: "/opt/tools/java/openjdk/jdk-24/latest" - name: "openjdk-jdk23-latest" home: "/opt/tools/java/openjdk/jdk-23/latest" - name: "openjdk-jdk22-latest" @@ -708,6 +892,8 @@ tool: installations: - name: "apache-maven-latest" home: "/opt/tools/apache-maven/latest" + - name: "apache-maven-3.9.9" + home: "/opt/tools/apache-maven/3.9.9" - name: "apache-maven-3.9.6" home: "/opt/tools/apache-maven/3.9.6" - name: "apache-maven-3.9.5" diff --git a/instances/ee4j.ejb/target/k8s/configmap-jenkins-config.yml b/instances/ee4j.ejb/target/k8s/configmap-jenkins-config.yml index 44235c3b3..8ffc9362c 100644 --- a/instances/ee4j.ejb/target/k8s/configmap-jenkins-config.yml +++ b/instances/ee4j.ejb/target/k8s/configmap-jenkins-config.yml @@ -508,6 +508,188 @@ data: name: m2-dir inheritYamlMergeStrategy: "true" yamlMergeStrategy: "merge" + - name: "ubuntu-2204" + namespace: "ejb" + label: "ubuntu-2204" + containers: + - name: "jnlp" + image: docker.io/eclipsecbi/jiro-agent-ubuntu-2204:remoting-3206.3208.v409508a_675ff + alwaysPullImage: true + livenessProbe: + failureThreshold: 0 + initialDelaySeconds: 0 + periodSeconds: 0 + successThreshold: 0 + timeoutSeconds: 0 + ttyEnabled: true + command: "" + args: "" + instanceCap: -1 + nodeUsageMode: EXCLUSIVE + envVars: + - envVar: + key: "JAVA_TOOL_OPTIONS" + 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" + - envVar: + key: "OPENJ9_JAVA_OPTIONS" + value: "-XX:+IgnoreUnrecognizedVMOptions -XX:+IdleTuningCompactOnIdle -XX:+IdleTuningGcOnIdle" + - envVar: + key: "_JAVA_OPTIONS" + value: "" + volumes: + - persistentVolumeClaim: + claimName: "tools-claim-jiro-ejb" + mountPath: "/opt/tools" + readOnly: true + - configMapVolume: + configMapName: "known-hosts" + mountPath: "/home/jenkins/.ssh/" + subPath: "." + - emptyDirVolume: + memory: false + mountPath: "/home/jenkins/" + - emptyDirVolume: + memory: false + mountPath: "/home/jenkins/.m2/repository" + - emptyDirVolume: + memory: false + mountPath: "/home/jenkins/.m2/wrapper" + workspaceVolume: + emptyDirWorkspaceVolume: + memory: false + yaml: | + apiVersion: v1 + kind: Pod + spec: + containers: + - name: jnlp + resources: + limits: + cpu: "2000m" + memory: "4096Mi" + requests: + cpu: "1000m" + memory: "4096Mi" + volumeMounts: + - name: m2-secret-dir + mountPath: /home/jenkins/.m2/settings-security.xml + subPath: settings-security.xml + readOnly: true + - name: m2-secret-dir + mountPath: /home/jenkins/.m2/settings.xml + subPath: settings.xml + readOnly: true + - name: m2-dir + mountPath: /home/jenkins/.m2/toolchains.xml + subPath: toolchains.xml + readOnly: true + - name: m2-dir + mountPath: /home/jenkins/.mavenrc + subPath: .mavenrc + readOnly: true + volumes: + - name: m2-secret-dir + secret: + secretName: m2-secret-dir + - name: m2-dir + configMap: + name: m2-dir + inheritYamlMergeStrategy: "true" + yamlMergeStrategy: "merge" + - name: "ubuntu-2404" + namespace: "ejb" + label: "ubuntu-latest ubuntu-2404" + containers: + - name: "jnlp" + image: docker.io/eclipsecbi/jiro-agent-ubuntu-2404:remoting-3206.3208.v409508a_675ff + alwaysPullImage: true + livenessProbe: + failureThreshold: 0 + initialDelaySeconds: 0 + periodSeconds: 0 + successThreshold: 0 + timeoutSeconds: 0 + ttyEnabled: true + command: "" + args: "" + instanceCap: -1 + nodeUsageMode: EXCLUSIVE + envVars: + - envVar: + key: "JAVA_TOOL_OPTIONS" + 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" + - envVar: + key: "OPENJ9_JAVA_OPTIONS" + value: "-XX:+IgnoreUnrecognizedVMOptions -XX:+IdleTuningCompactOnIdle -XX:+IdleTuningGcOnIdle" + - envVar: + key: "_JAVA_OPTIONS" + value: "" + volumes: + - persistentVolumeClaim: + claimName: "tools-claim-jiro-ejb" + mountPath: "/opt/tools" + readOnly: true + - configMapVolume: + configMapName: "known-hosts" + mountPath: "/home/jenkins/.ssh/" + subPath: "." + - emptyDirVolume: + memory: false + mountPath: "/home/jenkins/" + - emptyDirVolume: + memory: false + mountPath: "/home/jenkins/.m2/repository" + - emptyDirVolume: + memory: false + mountPath: "/home/jenkins/.m2/wrapper" + workspaceVolume: + emptyDirWorkspaceVolume: + memory: false + yaml: | + apiVersion: v1 + kind: Pod + spec: + containers: + - name: jnlp + resources: + limits: + cpu: "2000m" + memory: "4096Mi" + requests: + cpu: "1000m" + memory: "4096Mi" + volumeMounts: + - name: m2-secret-dir + mountPath: /home/jenkins/.m2/settings-security.xml + subPath: settings-security.xml + readOnly: true + - name: m2-secret-dir + mountPath: /home/jenkins/.m2/settings.xml + subPath: settings.xml + readOnly: true + - name: m2-dir + mountPath: /home/jenkins/.m2/toolchains.xml + subPath: toolchains.xml + readOnly: true + - name: m2-dir + mountPath: /home/jenkins/.mavenrc + subPath: .mavenrc + readOnly: true + volumes: + - name: m2-secret-dir + secret: + secretName: m2-secret-dir + - name: m2-dir + configMap: + name: m2-dir + inheritYamlMergeStrategy: "true" + yamlMergeStrategy: "merge" security: apiToken: creationOfLegacyTokenEnabled: false @@ -602,6 +784,8 @@ data: home: "/opt/tools/java/openjdk/latest" - name: "openjdk-ea-latest" home: "/opt/tools/java/openjdk/ea-latest" + - name: "openjdk-jdk24-latest" + home: "/opt/tools/java/openjdk/jdk-24/latest" - name: "openjdk-jdk23-latest" home: "/opt/tools/java/openjdk/jdk-23/latest" - name: "openjdk-jdk22-latest" @@ -731,6 +915,8 @@ data: installations: - name: "apache-maven-latest" home: "/opt/tools/apache-maven/latest" + - name: "apache-maven-3.9.9" + home: "/opt/tools/apache-maven/3.9.9" - name: "apache-maven-3.9.6" home: "/opt/tools/apache-maven/3.9.6" - name: "apache-maven-3.9.5" diff --git a/instances/ee4j.ejb/target/k8s/m2-dir.json b/instances/ee4j.ejb/target/k8s/m2-dir.json index 302549651..b9d8ea221 100644 --- a/instances/ee4j.ejb/target/k8s/m2-dir.json +++ b/instances/ee4j.ejb/target/k8s/m2-dir.json @@ -2,7 +2,7 @@ "apiVersion": "v1", "data": { ".mavenrc": "set -- -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn --batch-mode \"${@}\"", - "toolchains.xml": "\n\n \n jdk\n \n JavaSE-1.8\n 1.8\n oracle\n \n /opt/tools/java/oracle/jdk-8/latest\n \n \n jdk\n \n JavaSE-9\n 9\n openjdk\n \n /opt/tools/java/openjdk/jdk-9/latest\n \n \n jdk\n \n JavaSE-10\n 10\n openjdk\n \n /opt/tools/java/openjdk/jdk-10/latest\n \n \n jdk\n \n JavaSE-11\n 11\n openjdk\n \n /opt/tools/java/openjdk/jdk-11/latest\n \n \n jdk\n \n JavaSE-12\n 12\n openjdk\n \n /opt/tools/java/openjdk/jdk-12/latest\n \n \n jdk\n \n JavaSE-13\n 13\n openjdk\n \n /opt/tools/java/openjdk/jdk-13/latest\n \n \n jdk\n \n JavaSE-14\n 14\n openjdk\n \n /opt/tools/java/openjdk/jdk-14/latest\n \n \n jdk\n \n JavaSE-15\n 15\n openjdk\n \n /opt/tools/java/openjdk/jdk-15/latest\n \n \n jdk\n \n JavaSE-16\n 16\n openjdk\n \n /opt/tools/java/openjdk/jdk-16/latest\n \n \n jdk\n \n JavaSE-17\n 17\n openjdk\n \n /opt/tools/java/openjdk/jdk-17/latest\n \n \n jdk\n \n JavaSE-18\n 18\n openjdk\n \n /opt/tools/java/openjdk/jdk-18/latest\n \n \n jdk\n \n JavaSE-19\n 19\n openjdk\n \n /opt/tools/java/openjdk/jdk-19/latest\n \n \n jdk\n \n JavaSE-20\n 20\n openjdk\n \n /opt/tools/java/openjdk/jdk-20/latest\n \n \n jdk\n \n JavaSE-21\n 21\n openjdk\n \n /opt/tools/java/openjdk/jdk-21/latest\n \n \n jdk\n \n JavaSE-22\n 22\n openjdk\n \n /opt/tools/java/openjdk/jdk-22/latest\n \n \n jdk\n \n JavaSE-23\n 23\n openjdk\n \n /opt/tools/java/openjdk/jdk-23/latest\n \n\n" + "toolchains.xml": "\n\n \n jdk\n \n JavaSE-1.8\n 1.8\n oracle\n \n /opt/tools/java/oracle/jdk-8/latest\n \n \n jdk\n \n JavaSE-9\n 9\n openjdk\n \n /opt/tools/java/openjdk/jdk-9/latest\n \n \n jdk\n \n JavaSE-10\n 10\n openjdk\n \n /opt/tools/java/openjdk/jdk-10/latest\n \n \n jdk\n \n JavaSE-11\n 11\n openjdk\n \n /opt/tools/java/openjdk/jdk-11/latest\n \n \n jdk\n \n JavaSE-12\n 12\n openjdk\n \n /opt/tools/java/openjdk/jdk-12/latest\n \n \n jdk\n \n JavaSE-13\n 13\n openjdk\n \n /opt/tools/java/openjdk/jdk-13/latest\n \n \n jdk\n \n JavaSE-14\n 14\n openjdk\n \n /opt/tools/java/openjdk/jdk-14/latest\n \n \n jdk\n \n JavaSE-15\n 15\n openjdk\n \n /opt/tools/java/openjdk/jdk-15/latest\n \n \n jdk\n \n JavaSE-16\n 16\n openjdk\n \n /opt/tools/java/openjdk/jdk-16/latest\n \n \n jdk\n \n JavaSE-17\n 17\n openjdk\n \n /opt/tools/java/openjdk/jdk-17/latest\n \n \n jdk\n \n JavaSE-18\n 18\n openjdk\n \n /opt/tools/java/openjdk/jdk-18/latest\n \n \n jdk\n \n JavaSE-19\n 19\n openjdk\n \n /opt/tools/java/openjdk/jdk-19/latest\n \n \n jdk\n \n JavaSE-20\n 20\n openjdk\n \n /opt/tools/java/openjdk/jdk-20/latest\n \n \n jdk\n \n JavaSE-21\n 21\n openjdk\n \n /opt/tools/java/openjdk/jdk-21/latest\n \n \n jdk\n \n JavaSE-22\n 22\n openjdk\n \n /opt/tools/java/openjdk/jdk-22/latest\n \n \n jdk\n \n JavaSE-23\n 23\n openjdk\n \n /opt/tools/java/openjdk/jdk-23/latest\n \n \n jdk\n \n JavaSE-24\n 24\n openjdk\n \n /opt/tools/java/openjdk/jdk-24/latest\n \n\n" }, "kind": "ConfigMap", "metadata": { diff --git a/instances/ee4j.ejb/target/k8s/statefulset.json b/instances/ee4j.ejb/target/k8s/statefulset.json index 17de39279..fab68fb1e 100644 --- a/instances/ee4j.ejb/target/k8s/statefulset.json +++ b/instances/ee4j.ejb/target/k8s/statefulset.json @@ -119,6 +119,12 @@ "cpu": "250m" } }, + "securityContext": { + "seLinuxOptions": { + "level": "s0:c37,c19", + "type": "spc_t" + } + }, "volumeMounts": [ { "mountPath": "/var/jenkins", diff --git a/instances/ee4j.epicyro/config.jsonnet b/instances/ee4j.epicyro/config.jsonnet index b61d16497..b0e0f4da0 100644 --- a/instances/ee4j.epicyro/config.jsonnet +++ b/instances/ee4j.epicyro/config.jsonnet @@ -3,4 +3,5 @@ fullName: "ee4j.epicyro", displayName: "Eclipse Epicyro", }, + seLinuxLevel: "s0:c55,c10", } diff --git a/instances/ee4j.epicyro/target/config.json b/instances/ee4j.epicyro/target/config.json index 8db7c5131..ca2c8f46e 100644 --- a/instances/ee4j.epicyro/target/config.json +++ b/instances/ee4j.epicyro/target/config.json @@ -217,7 +217,7 @@ "docker.io/eclipsecbi/jiro-agent-centos-7:latest" ], "context": "centos-7", - "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-centos-7: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 [ \"uid_entrypoint\", \"/usr/local/bin/jenkins-agent\" ]\n\nADD \"https://repo.jenkins-ci.org/public/org/jenkins-ci/main/remoting/3206.3208.v409508a_675ff/remoting-3206.3208.v409508a_675ff.jar\" \"/usr/share/jenkins/agent.jar\" \nADD \"https://github.com/jenkinsci/docker-agent/raw/3206.vb_15dcf73f6a_9-12/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\nUSER 10001:0\n", + "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-centos-7: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/3206.3208.v409508a_675ff/remoting-3206.3208.v409508a_675ff.jar\" \"/usr/share/jenkins/agent.jar\"\nADD \"https://github.com/jenkinsci/docker-agent/raw/3206.vb_15dcf73f6a_9-12/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\nUSER 10001:0\n", "image": "jiro-agent-centos-7", "registry": "docker.io", "repository": "eclipsecbi", @@ -316,7 +316,7 @@ "docker.io/eclipsecbi/jiro-agent-centos-8:latest" ], "context": "centos-8", - "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-centos-8: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 [ \"uid_entrypoint\", \"/usr/local/bin/jenkins-agent\" ]\n\nADD \"https://repo.jenkins-ci.org/public/org/jenkins-ci/main/remoting/3206.3208.v409508a_675ff/remoting-3206.3208.v409508a_675ff.jar\" \"/usr/share/jenkins/agent.jar\" \nADD \"https://github.com/jenkinsci/docker-agent/raw/3206.vb_15dcf73f6a_9-12/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\nUSER 10001:0\n", + "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-centos-8: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/3206.3208.v409508a_675ff/remoting-3206.3208.v409508a_675ff.jar\" \"/usr/share/jenkins/agent.jar\"\nADD \"https://github.com/jenkinsci/docker-agent/raw/3206.vb_15dcf73f6a_9-12/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\nUSER 10001:0\n", "image": "jiro-agent-centos-8", "registry": "docker.io", "repository": "eclipsecbi", @@ -406,6 +406,203 @@ }, "startupScript": "/usr/local/bin/jenkins-agent", "username": "jenkins" + }, + "ubuntu-2204": { + "agentWorkdir": "/home/jenkins/jenkins-agent", + "docker": { + "aliases": [ + "docker.io/eclipsecbi/jiro-agent-ubuntu-2204:latest" + ], + "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-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/3206.3208.v409508a_675ff/remoting-3206.3208.v409508a_675ff.jar\" \"/usr/share/jenkins/agent.jar\"\nADD \"https://github.com/jenkinsci/docker-agent/raw/3206.vb_15dcf73f6a_9-12/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\nUSER 10001:0\n", + "image": "jiro-agent-ubuntu-2204", + "registry": "docker.io", + "repository": "eclipsecbi", + "tag": "remoting-3206.3208.v409508a_675ff" + }, + "env": { + "JAVA_TOOL_OPTIONS": [ ], + "JENKINS_REMOTING_JAVA_OPTS": [ + "-showversion", + "-XshowSettings:vm", + "-Xmx256m", + "-Dorg.jenkinsci.remoting.engine.JnlpProtocol3.disabled=true", + "-Dorg.jenkinsci.plugins.gitclient.CliGitAPIImpl.useSETSID=true" + ], + "OPENJ9_JAVA_OPTIONS": [ + "-XX:+IgnoreUnrecognizedVMOptions", + "-XX:+IdleTuningCompactOnIdle", + "-XX:+IdleTuningGcOnIdle" + ], + "_JAVA_OPTIONS": [ ] + }, + "home": "/home/jenkins", + "kubernetes": { + "inheritYamlMergeStrategy": true, + "resources": { + "cpu": { + "limit": "2000m", + "request": "1000m" + }, + "memory": { + "limit": "4096Mi", + "request": "4096Mi" + } + }, + "volumes": [ + { + "mounts": [ + { + "mountPath": "/home/jenkins/.m2/settings-security.xml", + "subPath": "settings-security.xml" + }, + { + "mountPath": "/home/jenkins/.m2/settings.xml", + "subPath": "settings.xml" + } + ], + "name": "m2-secret-dir", + "secret": { + "name": "m2-secret-dir" + } + }, + { + "configMap": { + "name": "m2-dir" + }, + "mounts": [ + { + "mountPath": "/home/jenkins/.m2/toolchains.xml", + "subPath": "toolchains.xml" + }, + { + "mountPath": "/home/jenkins/.mavenrc", + "subPath": ".mavenrc" + } + ], + "name": "m2-dir" + } + ], + "yamlMergeStrategy": "merge" + }, + "labels": [ + "ubuntu-2204" + ], + "maxHeap": "256m", + "mode": "EXCLUSIVE", + "name": "ubuntu-2204", + "remoting": { + "jar": "/usr/share/jenkins/agent.jar", + "startupScript": { + "name": "jenkins-agent", + "url": "https://github.com/jenkinsci/docker-agent/raw/3206.vb_15dcf73f6a_9-12/jenkins-agent", + "version": "3206.vb_15dcf73f6a_9-12" + }, + "url": "https://repo.jenkins-ci.org/public/org/jenkins-ci/main/remoting/3206.3208.v409508a_675ff/remoting-3206.3208.v409508a_675ff.jar", + "version": "3206.3208.v409508a_675ff" + }, + "startupScript": "/usr/local/bin/jenkins-agent", + "username": "jenkins" + }, + "ubuntu-2404": { + "agentWorkdir": "/home/jenkins/jenkins-agent", + "docker": { + "aliases": [ + "docker.io/eclipsecbi/jiro-agent-ubuntu-2404:latest" + ], + "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-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/3206.3208.v409508a_675ff/remoting-3206.3208.v409508a_675ff.jar\" \"/usr/share/jenkins/agent.jar\"\nADD \"https://github.com/jenkinsci/docker-agent/raw/3206.vb_15dcf73f6a_9-12/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\nUSER 10001:0\n", + "image": "jiro-agent-ubuntu-2404", + "registry": "docker.io", + "repository": "eclipsecbi", + "tag": "remoting-3206.3208.v409508a_675ff" + }, + "env": { + "JAVA_TOOL_OPTIONS": [ ], + "JENKINS_REMOTING_JAVA_OPTS": [ + "-showversion", + "-XshowSettings:vm", + "-Xmx256m", + "-Dorg.jenkinsci.remoting.engine.JnlpProtocol3.disabled=true", + "-Dorg.jenkinsci.plugins.gitclient.CliGitAPIImpl.useSETSID=true" + ], + "OPENJ9_JAVA_OPTIONS": [ + "-XX:+IgnoreUnrecognizedVMOptions", + "-XX:+IdleTuningCompactOnIdle", + "-XX:+IdleTuningGcOnIdle" + ], + "_JAVA_OPTIONS": [ ] + }, + "home": "/home/jenkins", + "kubernetes": { + "inheritYamlMergeStrategy": true, + "resources": { + "cpu": { + "limit": "2000m", + "request": "1000m" + }, + "memory": { + "limit": "4096Mi", + "request": "4096Mi" + } + }, + "volumes": [ + { + "mounts": [ + { + "mountPath": "/home/jenkins/.m2/settings-security.xml", + "subPath": "settings-security.xml" + }, + { + "mountPath": "/home/jenkins/.m2/settings.xml", + "subPath": "settings.xml" + } + ], + "name": "m2-secret-dir", + "secret": { + "name": "m2-secret-dir" + } + }, + { + "configMap": { + "name": "m2-dir" + }, + "mounts": [ + { + "mountPath": "/home/jenkins/.m2/toolchains.xml", + "subPath": "toolchains.xml" + }, + { + "mountPath": "/home/jenkins/.mavenrc", + "subPath": ".mavenrc" + } + ], + "name": "m2-dir" + } + ], + "yamlMergeStrategy": "merge" + }, + "labels": [ + "ubuntu-latest", + "ubuntu-2404" + ], + "maxHeap": "256m", + "mode": "EXCLUSIVE", + "name": "ubuntu-2404", + "remoting": { + "jar": "/usr/share/jenkins/agent.jar", + "startupScript": { + "name": "jenkins-agent", + "url": "https://github.com/jenkinsci/docker-agent/raw/3206.vb_15dcf73f6a_9-12/jenkins-agent", + "version": "3206.vb_15dcf73f6a_9-12" + }, + "url": "https://repo.jenkins-ci.org/public/org/jenkins-ci/main/remoting/3206.3208.v409508a_675ff/remoting-3206.3208.v409508a_675ff.jar", + "version": "3206.3208.v409508a_675ff" + }, + "startupScript": "/usr/local/bin/jenkins-agent", + "username": "jenkins" } } } @@ -701,6 +898,7 @@ }, "generate": false }, + "seLinuxLevel": "s0:c55,c10", "secrets": { "dockerconfigjson": { "dockerconfigjson-for-pull-as-default": { diff --git a/instances/ee4j.epicyro/target/jenkins/configuration.yml b/instances/ee4j.epicyro/target/jenkins/configuration.yml index d0ecb15cf..cc8fedabf 100644 --- a/instances/ee4j.epicyro/target/jenkins/configuration.yml +++ b/instances/ee4j.epicyro/target/jenkins/configuration.yml @@ -441,6 +441,188 @@ jenkins: name: m2-dir inheritYamlMergeStrategy: "true" yamlMergeStrategy: "merge" + - name: "ubuntu-2204" + namespace: "epicyro" + label: "ubuntu-2204" + containers: + - name: "jnlp" + image: docker.io/eclipsecbi/jiro-agent-ubuntu-2204:remoting-3206.3208.v409508a_675ff + alwaysPullImage: true + livenessProbe: + failureThreshold: 0 + initialDelaySeconds: 0 + periodSeconds: 0 + successThreshold: 0 + timeoutSeconds: 0 + ttyEnabled: true + command: "" + args: "" + instanceCap: -1 + nodeUsageMode: EXCLUSIVE + envVars: + - envVar: + key: "JAVA_TOOL_OPTIONS" + 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" + - envVar: + key: "OPENJ9_JAVA_OPTIONS" + value: "-XX:+IgnoreUnrecognizedVMOptions -XX:+IdleTuningCompactOnIdle -XX:+IdleTuningGcOnIdle" + - envVar: + key: "_JAVA_OPTIONS" + value: "" + volumes: + - persistentVolumeClaim: + claimName: "tools-claim-jiro-epicyro" + mountPath: "/opt/tools" + readOnly: true + - configMapVolume: + configMapName: "known-hosts" + mountPath: "/home/jenkins/.ssh/" + subPath: "." + - emptyDirVolume: + memory: false + mountPath: "/home/jenkins/" + - emptyDirVolume: + memory: false + mountPath: "/home/jenkins/.m2/repository" + - emptyDirVolume: + memory: false + mountPath: "/home/jenkins/.m2/wrapper" + workspaceVolume: + emptyDirWorkspaceVolume: + memory: false + yaml: | + apiVersion: v1 + kind: Pod + spec: + containers: + - name: jnlp + resources: + limits: + cpu: "2000m" + memory: "4096Mi" + requests: + cpu: "1000m" + memory: "4096Mi" + volumeMounts: + - name: m2-secret-dir + mountPath: /home/jenkins/.m2/settings-security.xml + subPath: settings-security.xml + readOnly: true + - name: m2-secret-dir + mountPath: /home/jenkins/.m2/settings.xml + subPath: settings.xml + readOnly: true + - name: m2-dir + mountPath: /home/jenkins/.m2/toolchains.xml + subPath: toolchains.xml + readOnly: true + - name: m2-dir + mountPath: /home/jenkins/.mavenrc + subPath: .mavenrc + readOnly: true + volumes: + - name: m2-secret-dir + secret: + secretName: m2-secret-dir + - name: m2-dir + configMap: + name: m2-dir + inheritYamlMergeStrategy: "true" + yamlMergeStrategy: "merge" + - name: "ubuntu-2404" + namespace: "epicyro" + label: "ubuntu-latest ubuntu-2404" + containers: + - name: "jnlp" + image: docker.io/eclipsecbi/jiro-agent-ubuntu-2404:remoting-3206.3208.v409508a_675ff + alwaysPullImage: true + livenessProbe: + failureThreshold: 0 + initialDelaySeconds: 0 + periodSeconds: 0 + successThreshold: 0 + timeoutSeconds: 0 + ttyEnabled: true + command: "" + args: "" + instanceCap: -1 + nodeUsageMode: EXCLUSIVE + envVars: + - envVar: + key: "JAVA_TOOL_OPTIONS" + 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" + - envVar: + key: "OPENJ9_JAVA_OPTIONS" + value: "-XX:+IgnoreUnrecognizedVMOptions -XX:+IdleTuningCompactOnIdle -XX:+IdleTuningGcOnIdle" + - envVar: + key: "_JAVA_OPTIONS" + value: "" + volumes: + - persistentVolumeClaim: + claimName: "tools-claim-jiro-epicyro" + mountPath: "/opt/tools" + readOnly: true + - configMapVolume: + configMapName: "known-hosts" + mountPath: "/home/jenkins/.ssh/" + subPath: "." + - emptyDirVolume: + memory: false + mountPath: "/home/jenkins/" + - emptyDirVolume: + memory: false + mountPath: "/home/jenkins/.m2/repository" + - emptyDirVolume: + memory: false + mountPath: "/home/jenkins/.m2/wrapper" + workspaceVolume: + emptyDirWorkspaceVolume: + memory: false + yaml: | + apiVersion: v1 + kind: Pod + spec: + containers: + - name: jnlp + resources: + limits: + cpu: "2000m" + memory: "4096Mi" + requests: + cpu: "1000m" + memory: "4096Mi" + volumeMounts: + - name: m2-secret-dir + mountPath: /home/jenkins/.m2/settings-security.xml + subPath: settings-security.xml + readOnly: true + - name: m2-secret-dir + mountPath: /home/jenkins/.m2/settings.xml + subPath: settings.xml + readOnly: true + - name: m2-dir + mountPath: /home/jenkins/.m2/toolchains.xml + subPath: toolchains.xml + readOnly: true + - name: m2-dir + mountPath: /home/jenkins/.mavenrc + subPath: .mavenrc + readOnly: true + volumes: + - name: m2-secret-dir + secret: + secretName: m2-secret-dir + - name: m2-dir + configMap: + name: m2-dir + inheritYamlMergeStrategy: "true" + yamlMergeStrategy: "merge" security: apiToken: creationOfLegacyTokenEnabled: false @@ -535,6 +717,8 @@ tool: home: "/opt/tools/java/openjdk/latest" - name: "openjdk-ea-latest" home: "/opt/tools/java/openjdk/ea-latest" + - name: "openjdk-jdk24-latest" + home: "/opt/tools/java/openjdk/jdk-24/latest" - name: "openjdk-jdk23-latest" home: "/opt/tools/java/openjdk/jdk-23/latest" - name: "openjdk-jdk22-latest" @@ -664,6 +848,8 @@ tool: installations: - name: "apache-maven-latest" home: "/opt/tools/apache-maven/latest" + - name: "apache-maven-3.9.9" + home: "/opt/tools/apache-maven/3.9.9" - name: "apache-maven-3.9.6" home: "/opt/tools/apache-maven/3.9.6" - name: "apache-maven-3.9.5" diff --git a/instances/ee4j.epicyro/target/k8s/configmap-jenkins-config.yml b/instances/ee4j.epicyro/target/k8s/configmap-jenkins-config.yml index 6b0dbfe47..6ffc4cccf 100644 --- a/instances/ee4j.epicyro/target/k8s/configmap-jenkins-config.yml +++ b/instances/ee4j.epicyro/target/k8s/configmap-jenkins-config.yml @@ -464,6 +464,188 @@ data: name: m2-dir inheritYamlMergeStrategy: "true" yamlMergeStrategy: "merge" + - name: "ubuntu-2204" + namespace: "epicyro" + label: "ubuntu-2204" + containers: + - name: "jnlp" + image: docker.io/eclipsecbi/jiro-agent-ubuntu-2204:remoting-3206.3208.v409508a_675ff + alwaysPullImage: true + livenessProbe: + failureThreshold: 0 + initialDelaySeconds: 0 + periodSeconds: 0 + successThreshold: 0 + timeoutSeconds: 0 + ttyEnabled: true + command: "" + args: "" + instanceCap: -1 + nodeUsageMode: EXCLUSIVE + envVars: + - envVar: + key: "JAVA_TOOL_OPTIONS" + 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" + - envVar: + key: "OPENJ9_JAVA_OPTIONS" + value: "-XX:+IgnoreUnrecognizedVMOptions -XX:+IdleTuningCompactOnIdle -XX:+IdleTuningGcOnIdle" + - envVar: + key: "_JAVA_OPTIONS" + value: "" + volumes: + - persistentVolumeClaim: + claimName: "tools-claim-jiro-epicyro" + mountPath: "/opt/tools" + readOnly: true + - configMapVolume: + configMapName: "known-hosts" + mountPath: "/home/jenkins/.ssh/" + subPath: "." + - emptyDirVolume: + memory: false + mountPath: "/home/jenkins/" + - emptyDirVolume: + memory: false + mountPath: "/home/jenkins/.m2/repository" + - emptyDirVolume: + memory: false + mountPath: "/home/jenkins/.m2/wrapper" + workspaceVolume: + emptyDirWorkspaceVolume: + memory: false + yaml: | + apiVersion: v1 + kind: Pod + spec: + containers: + - name: jnlp + resources: + limits: + cpu: "2000m" + memory: "4096Mi" + requests: + cpu: "1000m" + memory: "4096Mi" + volumeMounts: + - name: m2-secret-dir + mountPath: /home/jenkins/.m2/settings-security.xml + subPath: settings-security.xml + readOnly: true + - name: m2-secret-dir + mountPath: /home/jenkins/.m2/settings.xml + subPath: settings.xml + readOnly: true + - name: m2-dir + mountPath: /home/jenkins/.m2/toolchains.xml + subPath: toolchains.xml + readOnly: true + - name: m2-dir + mountPath: /home/jenkins/.mavenrc + subPath: .mavenrc + readOnly: true + volumes: + - name: m2-secret-dir + secret: + secretName: m2-secret-dir + - name: m2-dir + configMap: + name: m2-dir + inheritYamlMergeStrategy: "true" + yamlMergeStrategy: "merge" + - name: "ubuntu-2404" + namespace: "epicyro" + label: "ubuntu-latest ubuntu-2404" + containers: + - name: "jnlp" + image: docker.io/eclipsecbi/jiro-agent-ubuntu-2404:remoting-3206.3208.v409508a_675ff + alwaysPullImage: true + livenessProbe: + failureThreshold: 0 + initialDelaySeconds: 0 + periodSeconds: 0 + successThreshold: 0 + timeoutSeconds: 0 + ttyEnabled: true + command: "" + args: "" + instanceCap: -1 + nodeUsageMode: EXCLUSIVE + envVars: + - envVar: + key: "JAVA_TOOL_OPTIONS" + 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" + - envVar: + key: "OPENJ9_JAVA_OPTIONS" + value: "-XX:+IgnoreUnrecognizedVMOptions -XX:+IdleTuningCompactOnIdle -XX:+IdleTuningGcOnIdle" + - envVar: + key: "_JAVA_OPTIONS" + value: "" + volumes: + - persistentVolumeClaim: + claimName: "tools-claim-jiro-epicyro" + mountPath: "/opt/tools" + readOnly: true + - configMapVolume: + configMapName: "known-hosts" + mountPath: "/home/jenkins/.ssh/" + subPath: "." + - emptyDirVolume: + memory: false + mountPath: "/home/jenkins/" + - emptyDirVolume: + memory: false + mountPath: "/home/jenkins/.m2/repository" + - emptyDirVolume: + memory: false + mountPath: "/home/jenkins/.m2/wrapper" + workspaceVolume: + emptyDirWorkspaceVolume: + memory: false + yaml: | + apiVersion: v1 + kind: Pod + spec: + containers: + - name: jnlp + resources: + limits: + cpu: "2000m" + memory: "4096Mi" + requests: + cpu: "1000m" + memory: "4096Mi" + volumeMounts: + - name: m2-secret-dir + mountPath: /home/jenkins/.m2/settings-security.xml + subPath: settings-security.xml + readOnly: true + - name: m2-secret-dir + mountPath: /home/jenkins/.m2/settings.xml + subPath: settings.xml + readOnly: true + - name: m2-dir + mountPath: /home/jenkins/.m2/toolchains.xml + subPath: toolchains.xml + readOnly: true + - name: m2-dir + mountPath: /home/jenkins/.mavenrc + subPath: .mavenrc + readOnly: true + volumes: + - name: m2-secret-dir + secret: + secretName: m2-secret-dir + - name: m2-dir + configMap: + name: m2-dir + inheritYamlMergeStrategy: "true" + yamlMergeStrategy: "merge" security: apiToken: creationOfLegacyTokenEnabled: false @@ -558,6 +740,8 @@ data: home: "/opt/tools/java/openjdk/latest" - name: "openjdk-ea-latest" home: "/opt/tools/java/openjdk/ea-latest" + - name: "openjdk-jdk24-latest" + home: "/opt/tools/java/openjdk/jdk-24/latest" - name: "openjdk-jdk23-latest" home: "/opt/tools/java/openjdk/jdk-23/latest" - name: "openjdk-jdk22-latest" @@ -687,6 +871,8 @@ data: installations: - name: "apache-maven-latest" home: "/opt/tools/apache-maven/latest" + - name: "apache-maven-3.9.9" + home: "/opt/tools/apache-maven/3.9.9" - name: "apache-maven-3.9.6" home: "/opt/tools/apache-maven/3.9.6" - name: "apache-maven-3.9.5" diff --git a/instances/ee4j.epicyro/target/k8s/m2-dir.json b/instances/ee4j.epicyro/target/k8s/m2-dir.json index 27ccea6d8..58ed6942b 100644 --- a/instances/ee4j.epicyro/target/k8s/m2-dir.json +++ b/instances/ee4j.epicyro/target/k8s/m2-dir.json @@ -2,7 +2,7 @@ "apiVersion": "v1", "data": { ".mavenrc": "set -- -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn --batch-mode \"${@}\"", - "toolchains.xml": "\n\n \n jdk\n \n JavaSE-1.8\n 1.8\n oracle\n \n /opt/tools/java/oracle/jdk-8/latest\n \n \n jdk\n \n JavaSE-9\n 9\n openjdk\n \n /opt/tools/java/openjdk/jdk-9/latest\n \n \n jdk\n \n JavaSE-10\n 10\n openjdk\n \n /opt/tools/java/openjdk/jdk-10/latest\n \n \n jdk\n \n JavaSE-11\n 11\n openjdk\n \n /opt/tools/java/openjdk/jdk-11/latest\n \n \n jdk\n \n JavaSE-12\n 12\n openjdk\n \n /opt/tools/java/openjdk/jdk-12/latest\n \n \n jdk\n \n JavaSE-13\n 13\n openjdk\n \n /opt/tools/java/openjdk/jdk-13/latest\n \n \n jdk\n \n JavaSE-14\n 14\n openjdk\n \n /opt/tools/java/openjdk/jdk-14/latest\n \n \n jdk\n \n JavaSE-15\n 15\n openjdk\n \n /opt/tools/java/openjdk/jdk-15/latest\n \n \n jdk\n \n JavaSE-16\n 16\n openjdk\n \n /opt/tools/java/openjdk/jdk-16/latest\n \n \n jdk\n \n JavaSE-17\n 17\n openjdk\n \n /opt/tools/java/openjdk/jdk-17/latest\n \n \n jdk\n \n JavaSE-18\n 18\n openjdk\n \n /opt/tools/java/openjdk/jdk-18/latest\n \n \n jdk\n \n JavaSE-19\n 19\n openjdk\n \n /opt/tools/java/openjdk/jdk-19/latest\n \n \n jdk\n \n JavaSE-20\n 20\n openjdk\n \n /opt/tools/java/openjdk/jdk-20/latest\n \n \n jdk\n \n JavaSE-21\n 21\n openjdk\n \n /opt/tools/java/openjdk/jdk-21/latest\n \n \n jdk\n \n JavaSE-22\n 22\n openjdk\n \n /opt/tools/java/openjdk/jdk-22/latest\n \n \n jdk\n \n JavaSE-23\n 23\n openjdk\n \n /opt/tools/java/openjdk/jdk-23/latest\n \n\n" + "toolchains.xml": "\n\n \n jdk\n \n JavaSE-1.8\n 1.8\n oracle\n \n /opt/tools/java/oracle/jdk-8/latest\n \n \n jdk\n \n JavaSE-9\n 9\n openjdk\n \n /opt/tools/java/openjdk/jdk-9/latest\n \n \n jdk\n \n JavaSE-10\n 10\n openjdk\n \n /opt/tools/java/openjdk/jdk-10/latest\n \n \n jdk\n \n JavaSE-11\n 11\n openjdk\n \n /opt/tools/java/openjdk/jdk-11/latest\n \n \n jdk\n \n JavaSE-12\n 12\n openjdk\n \n /opt/tools/java/openjdk/jdk-12/latest\n \n \n jdk\n \n JavaSE-13\n 13\n openjdk\n \n /opt/tools/java/openjdk/jdk-13/latest\n \n \n jdk\n \n JavaSE-14\n 14\n openjdk\n \n /opt/tools/java/openjdk/jdk-14/latest\n \n \n jdk\n \n JavaSE-15\n 15\n openjdk\n \n /opt/tools/java/openjdk/jdk-15/latest\n \n \n jdk\n \n JavaSE-16\n 16\n openjdk\n \n /opt/tools/java/openjdk/jdk-16/latest\n \n \n jdk\n \n JavaSE-17\n 17\n openjdk\n \n /opt/tools/java/openjdk/jdk-17/latest\n \n \n jdk\n \n JavaSE-18\n 18\n openjdk\n \n /opt/tools/java/openjdk/jdk-18/latest\n \n \n jdk\n \n JavaSE-19\n 19\n openjdk\n \n /opt/tools/java/openjdk/jdk-19/latest\n \n \n jdk\n \n JavaSE-20\n 20\n openjdk\n \n /opt/tools/java/openjdk/jdk-20/latest\n \n \n jdk\n \n JavaSE-21\n 21\n openjdk\n \n /opt/tools/java/openjdk/jdk-21/latest\n \n \n jdk\n \n JavaSE-22\n 22\n openjdk\n \n /opt/tools/java/openjdk/jdk-22/latest\n \n \n jdk\n \n JavaSE-23\n 23\n openjdk\n \n /opt/tools/java/openjdk/jdk-23/latest\n \n \n jdk\n \n JavaSE-24\n 24\n openjdk\n \n /opt/tools/java/openjdk/jdk-24/latest\n \n\n" }, "kind": "ConfigMap", "metadata": { diff --git a/instances/ee4j.epicyro/target/k8s/statefulset.json b/instances/ee4j.epicyro/target/k8s/statefulset.json index 16d81d2a3..e3ebef392 100644 --- a/instances/ee4j.epicyro/target/k8s/statefulset.json +++ b/instances/ee4j.epicyro/target/k8s/statefulset.json @@ -119,6 +119,12 @@ "cpu": "250m" } }, + "securityContext": { + "seLinuxOptions": { + "level": "s0:c55,c10", + "type": "spc_t" + } + }, "volumeMounts": [ { "mountPath": "/var/jenkins", diff --git a/instances/ee4j.exousia/config.jsonnet b/instances/ee4j.exousia/config.jsonnet index 241cb8fb9..9b79d4ceb 100644 --- a/instances/ee4j.exousia/config.jsonnet +++ b/instances/ee4j.exousia/config.jsonnet @@ -8,4 +8,5 @@ "envinject" ] }, + seLinuxLevel: "s0:c36,c25", } diff --git a/instances/ee4j.exousia/target/config.json b/instances/ee4j.exousia/target/config.json index 739daa794..525b241cb 100644 --- a/instances/ee4j.exousia/target/config.json +++ b/instances/ee4j.exousia/target/config.json @@ -217,7 +217,7 @@ "docker.io/eclipsecbi/jiro-agent-centos-7:latest" ], "context": "centos-7", - "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-centos-7: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 [ \"uid_entrypoint\", \"/usr/local/bin/jenkins-agent\" ]\n\nADD \"https://repo.jenkins-ci.org/public/org/jenkins-ci/main/remoting/3206.3208.v409508a_675ff/remoting-3206.3208.v409508a_675ff.jar\" \"/usr/share/jenkins/agent.jar\" \nADD \"https://github.com/jenkinsci/docker-agent/raw/3206.vb_15dcf73f6a_9-12/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\nUSER 10001:0\n", + "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-centos-7: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/3206.3208.v409508a_675ff/remoting-3206.3208.v409508a_675ff.jar\" \"/usr/share/jenkins/agent.jar\"\nADD \"https://github.com/jenkinsci/docker-agent/raw/3206.vb_15dcf73f6a_9-12/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\nUSER 10001:0\n", "image": "jiro-agent-centos-7", "registry": "docker.io", "repository": "eclipsecbi", @@ -316,7 +316,7 @@ "docker.io/eclipsecbi/jiro-agent-centos-8:latest" ], "context": "centos-8", - "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-centos-8: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 [ \"uid_entrypoint\", \"/usr/local/bin/jenkins-agent\" ]\n\nADD \"https://repo.jenkins-ci.org/public/org/jenkins-ci/main/remoting/3206.3208.v409508a_675ff/remoting-3206.3208.v409508a_675ff.jar\" \"/usr/share/jenkins/agent.jar\" \nADD \"https://github.com/jenkinsci/docker-agent/raw/3206.vb_15dcf73f6a_9-12/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\nUSER 10001:0\n", + "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-centos-8: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/3206.3208.v409508a_675ff/remoting-3206.3208.v409508a_675ff.jar\" \"/usr/share/jenkins/agent.jar\"\nADD \"https://github.com/jenkinsci/docker-agent/raw/3206.vb_15dcf73f6a_9-12/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\nUSER 10001:0\n", "image": "jiro-agent-centos-8", "registry": "docker.io", "repository": "eclipsecbi", @@ -406,6 +406,203 @@ }, "startupScript": "/usr/local/bin/jenkins-agent", "username": "jenkins" + }, + "ubuntu-2204": { + "agentWorkdir": "/home/jenkins/jenkins-agent", + "docker": { + "aliases": [ + "docker.io/eclipsecbi/jiro-agent-ubuntu-2204:latest" + ], + "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-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/3206.3208.v409508a_675ff/remoting-3206.3208.v409508a_675ff.jar\" \"/usr/share/jenkins/agent.jar\"\nADD \"https://github.com/jenkinsci/docker-agent/raw/3206.vb_15dcf73f6a_9-12/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\nUSER 10001:0\n", + "image": "jiro-agent-ubuntu-2204", + "registry": "docker.io", + "repository": "eclipsecbi", + "tag": "remoting-3206.3208.v409508a_675ff" + }, + "env": { + "JAVA_TOOL_OPTIONS": [ ], + "JENKINS_REMOTING_JAVA_OPTS": [ + "-showversion", + "-XshowSettings:vm", + "-Xmx256m", + "-Dorg.jenkinsci.remoting.engine.JnlpProtocol3.disabled=true", + "-Dorg.jenkinsci.plugins.gitclient.CliGitAPIImpl.useSETSID=true" + ], + "OPENJ9_JAVA_OPTIONS": [ + "-XX:+IgnoreUnrecognizedVMOptions", + "-XX:+IdleTuningCompactOnIdle", + "-XX:+IdleTuningGcOnIdle" + ], + "_JAVA_OPTIONS": [ ] + }, + "home": "/home/jenkins", + "kubernetes": { + "inheritYamlMergeStrategy": true, + "resources": { + "cpu": { + "limit": "2000m", + "request": "1000m" + }, + "memory": { + "limit": "4096Mi", + "request": "4096Mi" + } + }, + "volumes": [ + { + "mounts": [ + { + "mountPath": "/home/jenkins/.m2/settings-security.xml", + "subPath": "settings-security.xml" + }, + { + "mountPath": "/home/jenkins/.m2/settings.xml", + "subPath": "settings.xml" + } + ], + "name": "m2-secret-dir", + "secret": { + "name": "m2-secret-dir" + } + }, + { + "configMap": { + "name": "m2-dir" + }, + "mounts": [ + { + "mountPath": "/home/jenkins/.m2/toolchains.xml", + "subPath": "toolchains.xml" + }, + { + "mountPath": "/home/jenkins/.mavenrc", + "subPath": ".mavenrc" + } + ], + "name": "m2-dir" + } + ], + "yamlMergeStrategy": "merge" + }, + "labels": [ + "ubuntu-2204" + ], + "maxHeap": "256m", + "mode": "EXCLUSIVE", + "name": "ubuntu-2204", + "remoting": { + "jar": "/usr/share/jenkins/agent.jar", + "startupScript": { + "name": "jenkins-agent", + "url": "https://github.com/jenkinsci/docker-agent/raw/3206.vb_15dcf73f6a_9-12/jenkins-agent", + "version": "3206.vb_15dcf73f6a_9-12" + }, + "url": "https://repo.jenkins-ci.org/public/org/jenkins-ci/main/remoting/3206.3208.v409508a_675ff/remoting-3206.3208.v409508a_675ff.jar", + "version": "3206.3208.v409508a_675ff" + }, + "startupScript": "/usr/local/bin/jenkins-agent", + "username": "jenkins" + }, + "ubuntu-2404": { + "agentWorkdir": "/home/jenkins/jenkins-agent", + "docker": { + "aliases": [ + "docker.io/eclipsecbi/jiro-agent-ubuntu-2404:latest" + ], + "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-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/3206.3208.v409508a_675ff/remoting-3206.3208.v409508a_675ff.jar\" \"/usr/share/jenkins/agent.jar\"\nADD \"https://github.com/jenkinsci/docker-agent/raw/3206.vb_15dcf73f6a_9-12/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\nUSER 10001:0\n", + "image": "jiro-agent-ubuntu-2404", + "registry": "docker.io", + "repository": "eclipsecbi", + "tag": "remoting-3206.3208.v409508a_675ff" + }, + "env": { + "JAVA_TOOL_OPTIONS": [ ], + "JENKINS_REMOTING_JAVA_OPTS": [ + "-showversion", + "-XshowSettings:vm", + "-Xmx256m", + "-Dorg.jenkinsci.remoting.engine.JnlpProtocol3.disabled=true", + "-Dorg.jenkinsci.plugins.gitclient.CliGitAPIImpl.useSETSID=true" + ], + "OPENJ9_JAVA_OPTIONS": [ + "-XX:+IgnoreUnrecognizedVMOptions", + "-XX:+IdleTuningCompactOnIdle", + "-XX:+IdleTuningGcOnIdle" + ], + "_JAVA_OPTIONS": [ ] + }, + "home": "/home/jenkins", + "kubernetes": { + "inheritYamlMergeStrategy": true, + "resources": { + "cpu": { + "limit": "2000m", + "request": "1000m" + }, + "memory": { + "limit": "4096Mi", + "request": "4096Mi" + } + }, + "volumes": [ + { + "mounts": [ + { + "mountPath": "/home/jenkins/.m2/settings-security.xml", + "subPath": "settings-security.xml" + }, + { + "mountPath": "/home/jenkins/.m2/settings.xml", + "subPath": "settings.xml" + } + ], + "name": "m2-secret-dir", + "secret": { + "name": "m2-secret-dir" + } + }, + { + "configMap": { + "name": "m2-dir" + }, + "mounts": [ + { + "mountPath": "/home/jenkins/.m2/toolchains.xml", + "subPath": "toolchains.xml" + }, + { + "mountPath": "/home/jenkins/.mavenrc", + "subPath": ".mavenrc" + } + ], + "name": "m2-dir" + } + ], + "yamlMergeStrategy": "merge" + }, + "labels": [ + "ubuntu-latest", + "ubuntu-2404" + ], + "maxHeap": "256m", + "mode": "EXCLUSIVE", + "name": "ubuntu-2404", + "remoting": { + "jar": "/usr/share/jenkins/agent.jar", + "startupScript": { + "name": "jenkins-agent", + "url": "https://github.com/jenkinsci/docker-agent/raw/3206.vb_15dcf73f6a_9-12/jenkins-agent", + "version": "3206.vb_15dcf73f6a_9-12" + }, + "url": "https://repo.jenkins-ci.org/public/org/jenkins-ci/main/remoting/3206.3208.v409508a_675ff/remoting-3206.3208.v409508a_675ff.jar", + "version": "3206.3208.v409508a_675ff" + }, + "startupScript": "/usr/local/bin/jenkins-agent", + "username": "jenkins" } } } @@ -702,6 +899,7 @@ }, "generate": false }, + "seLinuxLevel": "s0:c36,c25", "secrets": { "dockerconfigjson": { "dockerconfigjson-for-pull-as-default": { diff --git a/instances/ee4j.exousia/target/jenkins/configuration.yml b/instances/ee4j.exousia/target/jenkins/configuration.yml index 6dd01a194..e2bef5f68 100644 --- a/instances/ee4j.exousia/target/jenkins/configuration.yml +++ b/instances/ee4j.exousia/target/jenkins/configuration.yml @@ -441,6 +441,188 @@ jenkins: name: m2-dir inheritYamlMergeStrategy: "true" yamlMergeStrategy: "merge" + - name: "ubuntu-2204" + namespace: "exousia" + label: "ubuntu-2204" + containers: + - name: "jnlp" + image: docker.io/eclipsecbi/jiro-agent-ubuntu-2204:remoting-3206.3208.v409508a_675ff + alwaysPullImage: true + livenessProbe: + failureThreshold: 0 + initialDelaySeconds: 0 + periodSeconds: 0 + successThreshold: 0 + timeoutSeconds: 0 + ttyEnabled: true + command: "" + args: "" + instanceCap: -1 + nodeUsageMode: EXCLUSIVE + envVars: + - envVar: + key: "JAVA_TOOL_OPTIONS" + 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" + - envVar: + key: "OPENJ9_JAVA_OPTIONS" + value: "-XX:+IgnoreUnrecognizedVMOptions -XX:+IdleTuningCompactOnIdle -XX:+IdleTuningGcOnIdle" + - envVar: + key: "_JAVA_OPTIONS" + value: "" + volumes: + - persistentVolumeClaim: + claimName: "tools-claim-jiro-exousia" + mountPath: "/opt/tools" + readOnly: true + - configMapVolume: + configMapName: "known-hosts" + mountPath: "/home/jenkins/.ssh/" + subPath: "." + - emptyDirVolume: + memory: false + mountPath: "/home/jenkins/" + - emptyDirVolume: + memory: false + mountPath: "/home/jenkins/.m2/repository" + - emptyDirVolume: + memory: false + mountPath: "/home/jenkins/.m2/wrapper" + workspaceVolume: + emptyDirWorkspaceVolume: + memory: false + yaml: | + apiVersion: v1 + kind: Pod + spec: + containers: + - name: jnlp + resources: + limits: + cpu: "2000m" + memory: "4096Mi" + requests: + cpu: "1000m" + memory: "4096Mi" + volumeMounts: + - name: m2-secret-dir + mountPath: /home/jenkins/.m2/settings-security.xml + subPath: settings-security.xml + readOnly: true + - name: m2-secret-dir + mountPath: /home/jenkins/.m2/settings.xml + subPath: settings.xml + readOnly: true + - name: m2-dir + mountPath: /home/jenkins/.m2/toolchains.xml + subPath: toolchains.xml + readOnly: true + - name: m2-dir + mountPath: /home/jenkins/.mavenrc + subPath: .mavenrc + readOnly: true + volumes: + - name: m2-secret-dir + secret: + secretName: m2-secret-dir + - name: m2-dir + configMap: + name: m2-dir + inheritYamlMergeStrategy: "true" + yamlMergeStrategy: "merge" + - name: "ubuntu-2404" + namespace: "exousia" + label: "ubuntu-latest ubuntu-2404" + containers: + - name: "jnlp" + image: docker.io/eclipsecbi/jiro-agent-ubuntu-2404:remoting-3206.3208.v409508a_675ff + alwaysPullImage: true + livenessProbe: + failureThreshold: 0 + initialDelaySeconds: 0 + periodSeconds: 0 + successThreshold: 0 + timeoutSeconds: 0 + ttyEnabled: true + command: "" + args: "" + instanceCap: -1 + nodeUsageMode: EXCLUSIVE + envVars: + - envVar: + key: "JAVA_TOOL_OPTIONS" + 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" + - envVar: + key: "OPENJ9_JAVA_OPTIONS" + value: "-XX:+IgnoreUnrecognizedVMOptions -XX:+IdleTuningCompactOnIdle -XX:+IdleTuningGcOnIdle" + - envVar: + key: "_JAVA_OPTIONS" + value: "" + volumes: + - persistentVolumeClaim: + claimName: "tools-claim-jiro-exousia" + mountPath: "/opt/tools" + readOnly: true + - configMapVolume: + configMapName: "known-hosts" + mountPath: "/home/jenkins/.ssh/" + subPath: "." + - emptyDirVolume: + memory: false + mountPath: "/home/jenkins/" + - emptyDirVolume: + memory: false + mountPath: "/home/jenkins/.m2/repository" + - emptyDirVolume: + memory: false + mountPath: "/home/jenkins/.m2/wrapper" + workspaceVolume: + emptyDirWorkspaceVolume: + memory: false + yaml: | + apiVersion: v1 + kind: Pod + spec: + containers: + - name: jnlp + resources: + limits: + cpu: "2000m" + memory: "4096Mi" + requests: + cpu: "1000m" + memory: "4096Mi" + volumeMounts: + - name: m2-secret-dir + mountPath: /home/jenkins/.m2/settings-security.xml + subPath: settings-security.xml + readOnly: true + - name: m2-secret-dir + mountPath: /home/jenkins/.m2/settings.xml + subPath: settings.xml + readOnly: true + - name: m2-dir + mountPath: /home/jenkins/.m2/toolchains.xml + subPath: toolchains.xml + readOnly: true + - name: m2-dir + mountPath: /home/jenkins/.mavenrc + subPath: .mavenrc + readOnly: true + volumes: + - name: m2-secret-dir + secret: + secretName: m2-secret-dir + - name: m2-dir + configMap: + name: m2-dir + inheritYamlMergeStrategy: "true" + yamlMergeStrategy: "merge" security: apiToken: creationOfLegacyTokenEnabled: false @@ -535,6 +717,8 @@ tool: home: "/opt/tools/java/openjdk/latest" - name: "openjdk-ea-latest" home: "/opt/tools/java/openjdk/ea-latest" + - name: "openjdk-jdk24-latest" + home: "/opt/tools/java/openjdk/jdk-24/latest" - name: "openjdk-jdk23-latest" home: "/opt/tools/java/openjdk/jdk-23/latest" - name: "openjdk-jdk22-latest" @@ -664,6 +848,8 @@ tool: installations: - name: "apache-maven-latest" home: "/opt/tools/apache-maven/latest" + - name: "apache-maven-3.9.9" + home: "/opt/tools/apache-maven/3.9.9" - name: "apache-maven-3.9.6" home: "/opt/tools/apache-maven/3.9.6" - name: "apache-maven-3.9.5" diff --git a/instances/ee4j.exousia/target/k8s/configmap-jenkins-config.yml b/instances/ee4j.exousia/target/k8s/configmap-jenkins-config.yml index 8a39adf3b..7ce586d3b 100644 --- a/instances/ee4j.exousia/target/k8s/configmap-jenkins-config.yml +++ b/instances/ee4j.exousia/target/k8s/configmap-jenkins-config.yml @@ -464,6 +464,188 @@ data: name: m2-dir inheritYamlMergeStrategy: "true" yamlMergeStrategy: "merge" + - name: "ubuntu-2204" + namespace: "exousia" + label: "ubuntu-2204" + containers: + - name: "jnlp" + image: docker.io/eclipsecbi/jiro-agent-ubuntu-2204:remoting-3206.3208.v409508a_675ff + alwaysPullImage: true + livenessProbe: + failureThreshold: 0 + initialDelaySeconds: 0 + periodSeconds: 0 + successThreshold: 0 + timeoutSeconds: 0 + ttyEnabled: true + command: "" + args: "" + instanceCap: -1 + nodeUsageMode: EXCLUSIVE + envVars: + - envVar: + key: "JAVA_TOOL_OPTIONS" + 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" + - envVar: + key: "OPENJ9_JAVA_OPTIONS" + value: "-XX:+IgnoreUnrecognizedVMOptions -XX:+IdleTuningCompactOnIdle -XX:+IdleTuningGcOnIdle" + - envVar: + key: "_JAVA_OPTIONS" + value: "" + volumes: + - persistentVolumeClaim: + claimName: "tools-claim-jiro-exousia" + mountPath: "/opt/tools" + readOnly: true + - configMapVolume: + configMapName: "known-hosts" + mountPath: "/home/jenkins/.ssh/" + subPath: "." + - emptyDirVolume: + memory: false + mountPath: "/home/jenkins/" + - emptyDirVolume: + memory: false + mountPath: "/home/jenkins/.m2/repository" + - emptyDirVolume: + memory: false + mountPath: "/home/jenkins/.m2/wrapper" + workspaceVolume: + emptyDirWorkspaceVolume: + memory: false + yaml: | + apiVersion: v1 + kind: Pod + spec: + containers: + - name: jnlp + resources: + limits: + cpu: "2000m" + memory: "4096Mi" + requests: + cpu: "1000m" + memory: "4096Mi" + volumeMounts: + - name: m2-secret-dir + mountPath: /home/jenkins/.m2/settings-security.xml + subPath: settings-security.xml + readOnly: true + - name: m2-secret-dir + mountPath: /home/jenkins/.m2/settings.xml + subPath: settings.xml + readOnly: true + - name: m2-dir + mountPath: /home/jenkins/.m2/toolchains.xml + subPath: toolchains.xml + readOnly: true + - name: m2-dir + mountPath: /home/jenkins/.mavenrc + subPath: .mavenrc + readOnly: true + volumes: + - name: m2-secret-dir + secret: + secretName: m2-secret-dir + - name: m2-dir + configMap: + name: m2-dir + inheritYamlMergeStrategy: "true" + yamlMergeStrategy: "merge" + - name: "ubuntu-2404" + namespace: "exousia" + label: "ubuntu-latest ubuntu-2404" + containers: + - name: "jnlp" + image: docker.io/eclipsecbi/jiro-agent-ubuntu-2404:remoting-3206.3208.v409508a_675ff + alwaysPullImage: true + livenessProbe: + failureThreshold: 0 + initialDelaySeconds: 0 + periodSeconds: 0 + successThreshold: 0 + timeoutSeconds: 0 + ttyEnabled: true + command: "" + args: "" + instanceCap: -1 + nodeUsageMode: EXCLUSIVE + envVars: + - envVar: + key: "JAVA_TOOL_OPTIONS" + 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" + - envVar: + key: "OPENJ9_JAVA_OPTIONS" + value: "-XX:+IgnoreUnrecognizedVMOptions -XX:+IdleTuningCompactOnIdle -XX:+IdleTuningGcOnIdle" + - envVar: + key: "_JAVA_OPTIONS" + value: "" + volumes: + - persistentVolumeClaim: + claimName: "tools-claim-jiro-exousia" + mountPath: "/opt/tools" + readOnly: true + - configMapVolume: + configMapName: "known-hosts" + mountPath: "/home/jenkins/.ssh/" + subPath: "." + - emptyDirVolume: + memory: false + mountPath: "/home/jenkins/" + - emptyDirVolume: + memory: false + mountPath: "/home/jenkins/.m2/repository" + - emptyDirVolume: + memory: false + mountPath: "/home/jenkins/.m2/wrapper" + workspaceVolume: + emptyDirWorkspaceVolume: + memory: false + yaml: | + apiVersion: v1 + kind: Pod + spec: + containers: + - name: jnlp + resources: + limits: + cpu: "2000m" + memory: "4096Mi" + requests: + cpu: "1000m" + memory: "4096Mi" + volumeMounts: + - name: m2-secret-dir + mountPath: /home/jenkins/.m2/settings-security.xml + subPath: settings-security.xml + readOnly: true + - name: m2-secret-dir + mountPath: /home/jenkins/.m2/settings.xml + subPath: settings.xml + readOnly: true + - name: m2-dir + mountPath: /home/jenkins/.m2/toolchains.xml + subPath: toolchains.xml + readOnly: true + - name: m2-dir + mountPath: /home/jenkins/.mavenrc + subPath: .mavenrc + readOnly: true + volumes: + - name: m2-secret-dir + secret: + secretName: m2-secret-dir + - name: m2-dir + configMap: + name: m2-dir + inheritYamlMergeStrategy: "true" + yamlMergeStrategy: "merge" security: apiToken: creationOfLegacyTokenEnabled: false @@ -558,6 +740,8 @@ data: home: "/opt/tools/java/openjdk/latest" - name: "openjdk-ea-latest" home: "/opt/tools/java/openjdk/ea-latest" + - name: "openjdk-jdk24-latest" + home: "/opt/tools/java/openjdk/jdk-24/latest" - name: "openjdk-jdk23-latest" home: "/opt/tools/java/openjdk/jdk-23/latest" - name: "openjdk-jdk22-latest" @@ -687,6 +871,8 @@ data: installations: - name: "apache-maven-latest" home: "/opt/tools/apache-maven/latest" + - name: "apache-maven-3.9.9" + home: "/opt/tools/apache-maven/3.9.9" - name: "apache-maven-3.9.6" home: "/opt/tools/apache-maven/3.9.6" - name: "apache-maven-3.9.5" diff --git a/instances/ee4j.exousia/target/k8s/m2-dir.json b/instances/ee4j.exousia/target/k8s/m2-dir.json index 73d9e483c..c822daa8f 100644 --- a/instances/ee4j.exousia/target/k8s/m2-dir.json +++ b/instances/ee4j.exousia/target/k8s/m2-dir.json @@ -2,7 +2,7 @@ "apiVersion": "v1", "data": { ".mavenrc": "set -- -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn --batch-mode \"${@}\"", - "toolchains.xml": "\n\n \n jdk\n \n JavaSE-1.8\n 1.8\n oracle\n \n /opt/tools/java/oracle/jdk-8/latest\n \n \n jdk\n \n JavaSE-9\n 9\n openjdk\n \n /opt/tools/java/openjdk/jdk-9/latest\n \n \n jdk\n \n JavaSE-10\n 10\n openjdk\n \n /opt/tools/java/openjdk/jdk-10/latest\n \n \n jdk\n \n JavaSE-11\n 11\n openjdk\n \n /opt/tools/java/openjdk/jdk-11/latest\n \n \n jdk\n \n JavaSE-12\n 12\n openjdk\n \n /opt/tools/java/openjdk/jdk-12/latest\n \n \n jdk\n \n JavaSE-13\n 13\n openjdk\n \n /opt/tools/java/openjdk/jdk-13/latest\n \n \n jdk\n \n JavaSE-14\n 14\n openjdk\n \n /opt/tools/java/openjdk/jdk-14/latest\n \n \n jdk\n \n JavaSE-15\n 15\n openjdk\n \n /opt/tools/java/openjdk/jdk-15/latest\n \n \n jdk\n \n JavaSE-16\n 16\n openjdk\n \n /opt/tools/java/openjdk/jdk-16/latest\n \n \n jdk\n \n JavaSE-17\n 17\n openjdk\n \n /opt/tools/java/openjdk/jdk-17/latest\n \n \n jdk\n \n JavaSE-18\n 18\n openjdk\n \n /opt/tools/java/openjdk/jdk-18/latest\n \n \n jdk\n \n JavaSE-19\n 19\n openjdk\n \n /opt/tools/java/openjdk/jdk-19/latest\n \n \n jdk\n \n JavaSE-20\n 20\n openjdk\n \n /opt/tools/java/openjdk/jdk-20/latest\n \n \n jdk\n \n JavaSE-21\n 21\n openjdk\n \n /opt/tools/java/openjdk/jdk-21/latest\n \n \n jdk\n \n JavaSE-22\n 22\n openjdk\n \n /opt/tools/java/openjdk/jdk-22/latest\n \n \n jdk\n \n JavaSE-23\n 23\n openjdk\n \n /opt/tools/java/openjdk/jdk-23/latest\n \n\n" + "toolchains.xml": "\n\n \n jdk\n \n JavaSE-1.8\n 1.8\n oracle\n \n /opt/tools/java/oracle/jdk-8/latest\n \n \n jdk\n \n JavaSE-9\n 9\n openjdk\n \n /opt/tools/java/openjdk/jdk-9/latest\n \n \n jdk\n \n JavaSE-10\n 10\n openjdk\n \n /opt/tools/java/openjdk/jdk-10/latest\n \n \n jdk\n \n JavaSE-11\n 11\n openjdk\n \n /opt/tools/java/openjdk/jdk-11/latest\n \n \n jdk\n \n JavaSE-12\n 12\n openjdk\n \n /opt/tools/java/openjdk/jdk-12/latest\n \n \n jdk\n \n JavaSE-13\n 13\n openjdk\n \n /opt/tools/java/openjdk/jdk-13/latest\n \n \n jdk\n \n JavaSE-14\n 14\n openjdk\n \n /opt/tools/java/openjdk/jdk-14/latest\n \n \n jdk\n \n JavaSE-15\n 15\n openjdk\n \n /opt/tools/java/openjdk/jdk-15/latest\n \n \n jdk\n \n JavaSE-16\n 16\n openjdk\n \n /opt/tools/java/openjdk/jdk-16/latest\n \n \n jdk\n \n JavaSE-17\n 17\n openjdk\n \n /opt/tools/java/openjdk/jdk-17/latest\n \n \n jdk\n \n JavaSE-18\n 18\n openjdk\n \n /opt/tools/java/openjdk/jdk-18/latest\n \n \n jdk\n \n JavaSE-19\n 19\n openjdk\n \n /opt/tools/java/openjdk/jdk-19/latest\n \n \n jdk\n \n JavaSE-20\n 20\n openjdk\n \n /opt/tools/java/openjdk/jdk-20/latest\n \n \n jdk\n \n JavaSE-21\n 21\n openjdk\n \n /opt/tools/java/openjdk/jdk-21/latest\n \n \n jdk\n \n JavaSE-22\n 22\n openjdk\n \n /opt/tools/java/openjdk/jdk-22/latest\n \n \n jdk\n \n JavaSE-23\n 23\n openjdk\n \n /opt/tools/java/openjdk/jdk-23/latest\n \n \n jdk\n \n JavaSE-24\n 24\n openjdk\n \n /opt/tools/java/openjdk/jdk-24/latest\n \n\n" }, "kind": "ConfigMap", "metadata": { diff --git a/instances/ee4j.exousia/target/k8s/statefulset.json b/instances/ee4j.exousia/target/k8s/statefulset.json index 923ed86ed..a2ea174c5 100644 --- a/instances/ee4j.exousia/target/k8s/statefulset.json +++ b/instances/ee4j.exousia/target/k8s/statefulset.json @@ -119,6 +119,12 @@ "cpu": "250m" } }, + "securityContext": { + "seLinuxOptions": { + "level": "s0:c36,c25", + "type": "spc_t" + } + }, "volumeMounts": [ { "mountPath": "/var/jenkins", diff --git a/instances/ee4j.expressly/config.jsonnet b/instances/ee4j.expressly/config.jsonnet index 4f8677c6d..7804395a3 100644 --- a/instances/ee4j.expressly/config.jsonnet +++ b/instances/ee4j.expressly/config.jsonnet @@ -2,5 +2,6 @@ project+: { fullName: "ee4j.expressly", displayName: "Eclipse ExpressLy", - } + }, + seLinuxLevel: "s0:c52,c19", } diff --git a/instances/ee4j.expressly/target/config.json b/instances/ee4j.expressly/target/config.json index 5de31939b..521f74574 100644 --- a/instances/ee4j.expressly/target/config.json +++ b/instances/ee4j.expressly/target/config.json @@ -217,7 +217,7 @@ "docker.io/eclipsecbi/jiro-agent-centos-7:latest" ], "context": "centos-7", - "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-centos-7: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 [ \"uid_entrypoint\", \"/usr/local/bin/jenkins-agent\" ]\n\nADD \"https://repo.jenkins-ci.org/public/org/jenkins-ci/main/remoting/3206.3208.v409508a_675ff/remoting-3206.3208.v409508a_675ff.jar\" \"/usr/share/jenkins/agent.jar\" \nADD \"https://github.com/jenkinsci/docker-agent/raw/3206.vb_15dcf73f6a_9-12/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\nUSER 10001:0\n", + "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-centos-7: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/3206.3208.v409508a_675ff/remoting-3206.3208.v409508a_675ff.jar\" \"/usr/share/jenkins/agent.jar\"\nADD \"https://github.com/jenkinsci/docker-agent/raw/3206.vb_15dcf73f6a_9-12/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\nUSER 10001:0\n", "image": "jiro-agent-centos-7", "registry": "docker.io", "repository": "eclipsecbi", @@ -316,7 +316,7 @@ "docker.io/eclipsecbi/jiro-agent-centos-8:latest" ], "context": "centos-8", - "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-centos-8: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 [ \"uid_entrypoint\", \"/usr/local/bin/jenkins-agent\" ]\n\nADD \"https://repo.jenkins-ci.org/public/org/jenkins-ci/main/remoting/3206.3208.v409508a_675ff/remoting-3206.3208.v409508a_675ff.jar\" \"/usr/share/jenkins/agent.jar\" \nADD \"https://github.com/jenkinsci/docker-agent/raw/3206.vb_15dcf73f6a_9-12/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\nUSER 10001:0\n", + "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-centos-8: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/3206.3208.v409508a_675ff/remoting-3206.3208.v409508a_675ff.jar\" \"/usr/share/jenkins/agent.jar\"\nADD \"https://github.com/jenkinsci/docker-agent/raw/3206.vb_15dcf73f6a_9-12/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\nUSER 10001:0\n", "image": "jiro-agent-centos-8", "registry": "docker.io", "repository": "eclipsecbi", @@ -406,6 +406,203 @@ }, "startupScript": "/usr/local/bin/jenkins-agent", "username": "jenkins" + }, + "ubuntu-2204": { + "agentWorkdir": "/home/jenkins/jenkins-agent", + "docker": { + "aliases": [ + "docker.io/eclipsecbi/jiro-agent-ubuntu-2204:latest" + ], + "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-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/3206.3208.v409508a_675ff/remoting-3206.3208.v409508a_675ff.jar\" \"/usr/share/jenkins/agent.jar\"\nADD \"https://github.com/jenkinsci/docker-agent/raw/3206.vb_15dcf73f6a_9-12/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\nUSER 10001:0\n", + "image": "jiro-agent-ubuntu-2204", + "registry": "docker.io", + "repository": "eclipsecbi", + "tag": "remoting-3206.3208.v409508a_675ff" + }, + "env": { + "JAVA_TOOL_OPTIONS": [ ], + "JENKINS_REMOTING_JAVA_OPTS": [ + "-showversion", + "-XshowSettings:vm", + "-Xmx256m", + "-Dorg.jenkinsci.remoting.engine.JnlpProtocol3.disabled=true", + "-Dorg.jenkinsci.plugins.gitclient.CliGitAPIImpl.useSETSID=true" + ], + "OPENJ9_JAVA_OPTIONS": [ + "-XX:+IgnoreUnrecognizedVMOptions", + "-XX:+IdleTuningCompactOnIdle", + "-XX:+IdleTuningGcOnIdle" + ], + "_JAVA_OPTIONS": [ ] + }, + "home": "/home/jenkins", + "kubernetes": { + "inheritYamlMergeStrategy": true, + "resources": { + "cpu": { + "limit": "2000m", + "request": "1000m" + }, + "memory": { + "limit": "4096Mi", + "request": "4096Mi" + } + }, + "volumes": [ + { + "mounts": [ + { + "mountPath": "/home/jenkins/.m2/settings-security.xml", + "subPath": "settings-security.xml" + }, + { + "mountPath": "/home/jenkins/.m2/settings.xml", + "subPath": "settings.xml" + } + ], + "name": "m2-secret-dir", + "secret": { + "name": "m2-secret-dir" + } + }, + { + "configMap": { + "name": "m2-dir" + }, + "mounts": [ + { + "mountPath": "/home/jenkins/.m2/toolchains.xml", + "subPath": "toolchains.xml" + }, + { + "mountPath": "/home/jenkins/.mavenrc", + "subPath": ".mavenrc" + } + ], + "name": "m2-dir" + } + ], + "yamlMergeStrategy": "merge" + }, + "labels": [ + "ubuntu-2204" + ], + "maxHeap": "256m", + "mode": "EXCLUSIVE", + "name": "ubuntu-2204", + "remoting": { + "jar": "/usr/share/jenkins/agent.jar", + "startupScript": { + "name": "jenkins-agent", + "url": "https://github.com/jenkinsci/docker-agent/raw/3206.vb_15dcf73f6a_9-12/jenkins-agent", + "version": "3206.vb_15dcf73f6a_9-12" + }, + "url": "https://repo.jenkins-ci.org/public/org/jenkins-ci/main/remoting/3206.3208.v409508a_675ff/remoting-3206.3208.v409508a_675ff.jar", + "version": "3206.3208.v409508a_675ff" + }, + "startupScript": "/usr/local/bin/jenkins-agent", + "username": "jenkins" + }, + "ubuntu-2404": { + "agentWorkdir": "/home/jenkins/jenkins-agent", + "docker": { + "aliases": [ + "docker.io/eclipsecbi/jiro-agent-ubuntu-2404:latest" + ], + "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-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/3206.3208.v409508a_675ff/remoting-3206.3208.v409508a_675ff.jar\" \"/usr/share/jenkins/agent.jar\"\nADD \"https://github.com/jenkinsci/docker-agent/raw/3206.vb_15dcf73f6a_9-12/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\nUSER 10001:0\n", + "image": "jiro-agent-ubuntu-2404", + "registry": "docker.io", + "repository": "eclipsecbi", + "tag": "remoting-3206.3208.v409508a_675ff" + }, + "env": { + "JAVA_TOOL_OPTIONS": [ ], + "JENKINS_REMOTING_JAVA_OPTS": [ + "-showversion", + "-XshowSettings:vm", + "-Xmx256m", + "-Dorg.jenkinsci.remoting.engine.JnlpProtocol3.disabled=true", + "-Dorg.jenkinsci.plugins.gitclient.CliGitAPIImpl.useSETSID=true" + ], + "OPENJ9_JAVA_OPTIONS": [ + "-XX:+IgnoreUnrecognizedVMOptions", + "-XX:+IdleTuningCompactOnIdle", + "-XX:+IdleTuningGcOnIdle" + ], + "_JAVA_OPTIONS": [ ] + }, + "home": "/home/jenkins", + "kubernetes": { + "inheritYamlMergeStrategy": true, + "resources": { + "cpu": { + "limit": "2000m", + "request": "1000m" + }, + "memory": { + "limit": "4096Mi", + "request": "4096Mi" + } + }, + "volumes": [ + { + "mounts": [ + { + "mountPath": "/home/jenkins/.m2/settings-security.xml", + "subPath": "settings-security.xml" + }, + { + "mountPath": "/home/jenkins/.m2/settings.xml", + "subPath": "settings.xml" + } + ], + "name": "m2-secret-dir", + "secret": { + "name": "m2-secret-dir" + } + }, + { + "configMap": { + "name": "m2-dir" + }, + "mounts": [ + { + "mountPath": "/home/jenkins/.m2/toolchains.xml", + "subPath": "toolchains.xml" + }, + { + "mountPath": "/home/jenkins/.mavenrc", + "subPath": ".mavenrc" + } + ], + "name": "m2-dir" + } + ], + "yamlMergeStrategy": "merge" + }, + "labels": [ + "ubuntu-latest", + "ubuntu-2404" + ], + "maxHeap": "256m", + "mode": "EXCLUSIVE", + "name": "ubuntu-2404", + "remoting": { + "jar": "/usr/share/jenkins/agent.jar", + "startupScript": { + "name": "jenkins-agent", + "url": "https://github.com/jenkinsci/docker-agent/raw/3206.vb_15dcf73f6a_9-12/jenkins-agent", + "version": "3206.vb_15dcf73f6a_9-12" + }, + "url": "https://repo.jenkins-ci.org/public/org/jenkins-ci/main/remoting/3206.3208.v409508a_675ff/remoting-3206.3208.v409508a_675ff.jar", + "version": "3206.3208.v409508a_675ff" + }, + "startupScript": "/usr/local/bin/jenkins-agent", + "username": "jenkins" } } } @@ -701,6 +898,7 @@ }, "generate": false }, + "seLinuxLevel": "s0:c52,c19", "secrets": { "dockerconfigjson": { "dockerconfigjson-for-pull-as-default": { diff --git a/instances/ee4j.expressly/target/jenkins/configuration.yml b/instances/ee4j.expressly/target/jenkins/configuration.yml index 0699bf15a..0f221f04c 100644 --- a/instances/ee4j.expressly/target/jenkins/configuration.yml +++ b/instances/ee4j.expressly/target/jenkins/configuration.yml @@ -441,6 +441,188 @@ jenkins: name: m2-dir inheritYamlMergeStrategy: "true" yamlMergeStrategy: "merge" + - name: "ubuntu-2204" + namespace: "expressly" + label: "ubuntu-2204" + containers: + - name: "jnlp" + image: docker.io/eclipsecbi/jiro-agent-ubuntu-2204:remoting-3206.3208.v409508a_675ff + alwaysPullImage: true + livenessProbe: + failureThreshold: 0 + initialDelaySeconds: 0 + periodSeconds: 0 + successThreshold: 0 + timeoutSeconds: 0 + ttyEnabled: true + command: "" + args: "" + instanceCap: -1 + nodeUsageMode: EXCLUSIVE + envVars: + - envVar: + key: "JAVA_TOOL_OPTIONS" + 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" + - envVar: + key: "OPENJ9_JAVA_OPTIONS" + value: "-XX:+IgnoreUnrecognizedVMOptions -XX:+IdleTuningCompactOnIdle -XX:+IdleTuningGcOnIdle" + - envVar: + key: "_JAVA_OPTIONS" + value: "" + volumes: + - persistentVolumeClaim: + claimName: "tools-claim-jiro-expressly" + mountPath: "/opt/tools" + readOnly: true + - configMapVolume: + configMapName: "known-hosts" + mountPath: "/home/jenkins/.ssh/" + subPath: "." + - emptyDirVolume: + memory: false + mountPath: "/home/jenkins/" + - emptyDirVolume: + memory: false + mountPath: "/home/jenkins/.m2/repository" + - emptyDirVolume: + memory: false + mountPath: "/home/jenkins/.m2/wrapper" + workspaceVolume: + emptyDirWorkspaceVolume: + memory: false + yaml: | + apiVersion: v1 + kind: Pod + spec: + containers: + - name: jnlp + resources: + limits: + cpu: "2000m" + memory: "4096Mi" + requests: + cpu: "1000m" + memory: "4096Mi" + volumeMounts: + - name: m2-secret-dir + mountPath: /home/jenkins/.m2/settings-security.xml + subPath: settings-security.xml + readOnly: true + - name: m2-secret-dir + mountPath: /home/jenkins/.m2/settings.xml + subPath: settings.xml + readOnly: true + - name: m2-dir + mountPath: /home/jenkins/.m2/toolchains.xml + subPath: toolchains.xml + readOnly: true + - name: m2-dir + mountPath: /home/jenkins/.mavenrc + subPath: .mavenrc + readOnly: true + volumes: + - name: m2-secret-dir + secret: + secretName: m2-secret-dir + - name: m2-dir + configMap: + name: m2-dir + inheritYamlMergeStrategy: "true" + yamlMergeStrategy: "merge" + - name: "ubuntu-2404" + namespace: "expressly" + label: "ubuntu-latest ubuntu-2404" + containers: + - name: "jnlp" + image: docker.io/eclipsecbi/jiro-agent-ubuntu-2404:remoting-3206.3208.v409508a_675ff + alwaysPullImage: true + livenessProbe: + failureThreshold: 0 + initialDelaySeconds: 0 + periodSeconds: 0 + successThreshold: 0 + timeoutSeconds: 0 + ttyEnabled: true + command: "" + args: "" + instanceCap: -1 + nodeUsageMode: EXCLUSIVE + envVars: + - envVar: + key: "JAVA_TOOL_OPTIONS" + 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" + - envVar: + key: "OPENJ9_JAVA_OPTIONS" + value: "-XX:+IgnoreUnrecognizedVMOptions -XX:+IdleTuningCompactOnIdle -XX:+IdleTuningGcOnIdle" + - envVar: + key: "_JAVA_OPTIONS" + value: "" + volumes: + - persistentVolumeClaim: + claimName: "tools-claim-jiro-expressly" + mountPath: "/opt/tools" + readOnly: true + - configMapVolume: + configMapName: "known-hosts" + mountPath: "/home/jenkins/.ssh/" + subPath: "." + - emptyDirVolume: + memory: false + mountPath: "/home/jenkins/" + - emptyDirVolume: + memory: false + mountPath: "/home/jenkins/.m2/repository" + - emptyDirVolume: + memory: false + mountPath: "/home/jenkins/.m2/wrapper" + workspaceVolume: + emptyDirWorkspaceVolume: + memory: false + yaml: | + apiVersion: v1 + kind: Pod + spec: + containers: + - name: jnlp + resources: + limits: + cpu: "2000m" + memory: "4096Mi" + requests: + cpu: "1000m" + memory: "4096Mi" + volumeMounts: + - name: m2-secret-dir + mountPath: /home/jenkins/.m2/settings-security.xml + subPath: settings-security.xml + readOnly: true + - name: m2-secret-dir + mountPath: /home/jenkins/.m2/settings.xml + subPath: settings.xml + readOnly: true + - name: m2-dir + mountPath: /home/jenkins/.m2/toolchains.xml + subPath: toolchains.xml + readOnly: true + - name: m2-dir + mountPath: /home/jenkins/.mavenrc + subPath: .mavenrc + readOnly: true + volumes: + - name: m2-secret-dir + secret: + secretName: m2-secret-dir + - name: m2-dir + configMap: + name: m2-dir + inheritYamlMergeStrategy: "true" + yamlMergeStrategy: "merge" security: apiToken: creationOfLegacyTokenEnabled: false @@ -535,6 +717,8 @@ tool: home: "/opt/tools/java/openjdk/latest" - name: "openjdk-ea-latest" home: "/opt/tools/java/openjdk/ea-latest" + - name: "openjdk-jdk24-latest" + home: "/opt/tools/java/openjdk/jdk-24/latest" - name: "openjdk-jdk23-latest" home: "/opt/tools/java/openjdk/jdk-23/latest" - name: "openjdk-jdk22-latest" @@ -664,6 +848,8 @@ tool: installations: - name: "apache-maven-latest" home: "/opt/tools/apache-maven/latest" + - name: "apache-maven-3.9.9" + home: "/opt/tools/apache-maven/3.9.9" - name: "apache-maven-3.9.6" home: "/opt/tools/apache-maven/3.9.6" - name: "apache-maven-3.9.5" diff --git a/instances/ee4j.expressly/target/k8s/configmap-jenkins-config.yml b/instances/ee4j.expressly/target/k8s/configmap-jenkins-config.yml index 54438a6b2..10348d838 100644 --- a/instances/ee4j.expressly/target/k8s/configmap-jenkins-config.yml +++ b/instances/ee4j.expressly/target/k8s/configmap-jenkins-config.yml @@ -464,6 +464,188 @@ data: name: m2-dir inheritYamlMergeStrategy: "true" yamlMergeStrategy: "merge" + - name: "ubuntu-2204" + namespace: "expressly" + label: "ubuntu-2204" + containers: + - name: "jnlp" + image: docker.io/eclipsecbi/jiro-agent-ubuntu-2204:remoting-3206.3208.v409508a_675ff + alwaysPullImage: true + livenessProbe: + failureThreshold: 0 + initialDelaySeconds: 0 + periodSeconds: 0 + successThreshold: 0 + timeoutSeconds: 0 + ttyEnabled: true + command: "" + args: "" + instanceCap: -1 + nodeUsageMode: EXCLUSIVE + envVars: + - envVar: + key: "JAVA_TOOL_OPTIONS" + 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" + - envVar: + key: "OPENJ9_JAVA_OPTIONS" + value: "-XX:+IgnoreUnrecognizedVMOptions -XX:+IdleTuningCompactOnIdle -XX:+IdleTuningGcOnIdle" + - envVar: + key: "_JAVA_OPTIONS" + value: "" + volumes: + - persistentVolumeClaim: + claimName: "tools-claim-jiro-expressly" + mountPath: "/opt/tools" + readOnly: true + - configMapVolume: + configMapName: "known-hosts" + mountPath: "/home/jenkins/.ssh/" + subPath: "." + - emptyDirVolume: + memory: false + mountPath: "/home/jenkins/" + - emptyDirVolume: + memory: false + mountPath: "/home/jenkins/.m2/repository" + - emptyDirVolume: + memory: false + mountPath: "/home/jenkins/.m2/wrapper" + workspaceVolume: + emptyDirWorkspaceVolume: + memory: false + yaml: | + apiVersion: v1 + kind: Pod + spec: + containers: + - name: jnlp + resources: + limits: + cpu: "2000m" + memory: "4096Mi" + requests: + cpu: "1000m" + memory: "4096Mi" + volumeMounts: + - name: m2-secret-dir + mountPath: /home/jenkins/.m2/settings-security.xml + subPath: settings-security.xml + readOnly: true + - name: m2-secret-dir + mountPath: /home/jenkins/.m2/settings.xml + subPath: settings.xml + readOnly: true + - name: m2-dir + mountPath: /home/jenkins/.m2/toolchains.xml + subPath: toolchains.xml + readOnly: true + - name: m2-dir + mountPath: /home/jenkins/.mavenrc + subPath: .mavenrc + readOnly: true + volumes: + - name: m2-secret-dir + secret: + secretName: m2-secret-dir + - name: m2-dir + configMap: + name: m2-dir + inheritYamlMergeStrategy: "true" + yamlMergeStrategy: "merge" + - name: "ubuntu-2404" + namespace: "expressly" + label: "ubuntu-latest ubuntu-2404" + containers: + - name: "jnlp" + image: docker.io/eclipsecbi/jiro-agent-ubuntu-2404:remoting-3206.3208.v409508a_675ff + alwaysPullImage: true + livenessProbe: + failureThreshold: 0 + initialDelaySeconds: 0 + periodSeconds: 0 + successThreshold: 0 + timeoutSeconds: 0 + ttyEnabled: true + command: "" + args: "" + instanceCap: -1 + nodeUsageMode: EXCLUSIVE + envVars: + - envVar: + key: "JAVA_TOOL_OPTIONS" + 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" + - envVar: + key: "OPENJ9_JAVA_OPTIONS" + value: "-XX:+IgnoreUnrecognizedVMOptions -XX:+IdleTuningCompactOnIdle -XX:+IdleTuningGcOnIdle" + - envVar: + key: "_JAVA_OPTIONS" + value: "" + volumes: + - persistentVolumeClaim: + claimName: "tools-claim-jiro-expressly" + mountPath: "/opt/tools" + readOnly: true + - configMapVolume: + configMapName: "known-hosts" + mountPath: "/home/jenkins/.ssh/" + subPath: "." + - emptyDirVolume: + memory: false + mountPath: "/home/jenkins/" + - emptyDirVolume: + memory: false + mountPath: "/home/jenkins/.m2/repository" + - emptyDirVolume: + memory: false + mountPath: "/home/jenkins/.m2/wrapper" + workspaceVolume: + emptyDirWorkspaceVolume: + memory: false + yaml: | + apiVersion: v1 + kind: Pod + spec: + containers: + - name: jnlp + resources: + limits: + cpu: "2000m" + memory: "4096Mi" + requests: + cpu: "1000m" + memory: "4096Mi" + volumeMounts: + - name: m2-secret-dir + mountPath: /home/jenkins/.m2/settings-security.xml + subPath: settings-security.xml + readOnly: true + - name: m2-secret-dir + mountPath: /home/jenkins/.m2/settings.xml + subPath: settings.xml + readOnly: true + - name: m2-dir + mountPath: /home/jenkins/.m2/toolchains.xml + subPath: toolchains.xml + readOnly: true + - name: m2-dir + mountPath: /home/jenkins/.mavenrc + subPath: .mavenrc + readOnly: true + volumes: + - name: m2-secret-dir + secret: + secretName: m2-secret-dir + - name: m2-dir + configMap: + name: m2-dir + inheritYamlMergeStrategy: "true" + yamlMergeStrategy: "merge" security: apiToken: creationOfLegacyTokenEnabled: false @@ -558,6 +740,8 @@ data: home: "/opt/tools/java/openjdk/latest" - name: "openjdk-ea-latest" home: "/opt/tools/java/openjdk/ea-latest" + - name: "openjdk-jdk24-latest" + home: "/opt/tools/java/openjdk/jdk-24/latest" - name: "openjdk-jdk23-latest" home: "/opt/tools/java/openjdk/jdk-23/latest" - name: "openjdk-jdk22-latest" @@ -687,6 +871,8 @@ data: installations: - name: "apache-maven-latest" home: "/opt/tools/apache-maven/latest" + - name: "apache-maven-3.9.9" + home: "/opt/tools/apache-maven/3.9.9" - name: "apache-maven-3.9.6" home: "/opt/tools/apache-maven/3.9.6" - name: "apache-maven-3.9.5" diff --git a/instances/ee4j.expressly/target/k8s/m2-dir.json b/instances/ee4j.expressly/target/k8s/m2-dir.json index 80791bebf..69f41611c 100644 --- a/instances/ee4j.expressly/target/k8s/m2-dir.json +++ b/instances/ee4j.expressly/target/k8s/m2-dir.json @@ -2,7 +2,7 @@ "apiVersion": "v1", "data": { ".mavenrc": "set -- -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn --batch-mode \"${@}\"", - "toolchains.xml": "\n\n \n jdk\n \n JavaSE-1.8\n 1.8\n oracle\n \n /opt/tools/java/oracle/jdk-8/latest\n \n \n jdk\n \n JavaSE-9\n 9\n openjdk\n \n /opt/tools/java/openjdk/jdk-9/latest\n \n \n jdk\n \n JavaSE-10\n 10\n openjdk\n \n /opt/tools/java/openjdk/jdk-10/latest\n \n \n jdk\n \n JavaSE-11\n 11\n openjdk\n \n /opt/tools/java/openjdk/jdk-11/latest\n \n \n jdk\n \n JavaSE-12\n 12\n openjdk\n \n /opt/tools/java/openjdk/jdk-12/latest\n \n \n jdk\n \n JavaSE-13\n 13\n openjdk\n \n /opt/tools/java/openjdk/jdk-13/latest\n \n \n jdk\n \n JavaSE-14\n 14\n openjdk\n \n /opt/tools/java/openjdk/jdk-14/latest\n \n \n jdk\n \n JavaSE-15\n 15\n openjdk\n \n /opt/tools/java/openjdk/jdk-15/latest\n \n \n jdk\n \n JavaSE-16\n 16\n openjdk\n \n /opt/tools/java/openjdk/jdk-16/latest\n \n \n jdk\n \n JavaSE-17\n 17\n openjdk\n \n /opt/tools/java/openjdk/jdk-17/latest\n \n \n jdk\n \n JavaSE-18\n 18\n openjdk\n \n /opt/tools/java/openjdk/jdk-18/latest\n \n \n jdk\n \n JavaSE-19\n 19\n openjdk\n \n /opt/tools/java/openjdk/jdk-19/latest\n \n \n jdk\n \n JavaSE-20\n 20\n openjdk\n \n /opt/tools/java/openjdk/jdk-20/latest\n \n \n jdk\n \n JavaSE-21\n 21\n openjdk\n \n /opt/tools/java/openjdk/jdk-21/latest\n \n \n jdk\n \n JavaSE-22\n 22\n openjdk\n \n /opt/tools/java/openjdk/jdk-22/latest\n \n \n jdk\n \n JavaSE-23\n 23\n openjdk\n \n /opt/tools/java/openjdk/jdk-23/latest\n \n\n" + "toolchains.xml": "\n\n \n jdk\n \n JavaSE-1.8\n 1.8\n oracle\n \n /opt/tools/java/oracle/jdk-8/latest\n \n \n jdk\n \n JavaSE-9\n 9\n openjdk\n \n /opt/tools/java/openjdk/jdk-9/latest\n \n \n jdk\n \n JavaSE-10\n 10\n openjdk\n \n /opt/tools/java/openjdk/jdk-10/latest\n \n \n jdk\n \n JavaSE-11\n 11\n openjdk\n \n /opt/tools/java/openjdk/jdk-11/latest\n \n \n jdk\n \n JavaSE-12\n 12\n openjdk\n \n /opt/tools/java/openjdk/jdk-12/latest\n \n \n jdk\n \n JavaSE-13\n 13\n openjdk\n \n /opt/tools/java/openjdk/jdk-13/latest\n \n \n jdk\n \n JavaSE-14\n 14\n openjdk\n \n /opt/tools/java/openjdk/jdk-14/latest\n \n \n jdk\n \n JavaSE-15\n 15\n openjdk\n \n /opt/tools/java/openjdk/jdk-15/latest\n \n \n jdk\n \n JavaSE-16\n 16\n openjdk\n \n /opt/tools/java/openjdk/jdk-16/latest\n \n \n jdk\n \n JavaSE-17\n 17\n openjdk\n \n /opt/tools/java/openjdk/jdk-17/latest\n \n \n jdk\n \n JavaSE-18\n 18\n openjdk\n \n /opt/tools/java/openjdk/jdk-18/latest\n \n \n jdk\n \n JavaSE-19\n 19\n openjdk\n \n /opt/tools/java/openjdk/jdk-19/latest\n \n \n jdk\n \n JavaSE-20\n 20\n openjdk\n \n /opt/tools/java/openjdk/jdk-20/latest\n \n \n jdk\n \n JavaSE-21\n 21\n openjdk\n \n /opt/tools/java/openjdk/jdk-21/latest\n \n \n jdk\n \n JavaSE-22\n 22\n openjdk\n \n /opt/tools/java/openjdk/jdk-22/latest\n \n \n jdk\n \n JavaSE-23\n 23\n openjdk\n \n /opt/tools/java/openjdk/jdk-23/latest\n \n \n jdk\n \n JavaSE-24\n 24\n openjdk\n \n /opt/tools/java/openjdk/jdk-24/latest\n \n\n" }, "kind": "ConfigMap", "metadata": { diff --git a/instances/ee4j.expressly/target/k8s/statefulset.json b/instances/ee4j.expressly/target/k8s/statefulset.json index fe2ecf66f..689b9cd83 100644 --- a/instances/ee4j.expressly/target/k8s/statefulset.json +++ b/instances/ee4j.expressly/target/k8s/statefulset.json @@ -119,6 +119,12 @@ "cpu": "250m" } }, + "securityContext": { + "seLinuxOptions": { + "level": "s0:c52,c19", + "type": "spc_t" + } + }, "volumeMounts": [ { "mountPath": "/var/jenkins", diff --git a/instances/ee4j.faces/config.jsonnet b/instances/ee4j.faces/config.jsonnet index ce7080c6e..f4fae892b 100644 --- a/instances/ee4j.faces/config.jsonnet +++ b/instances/ee4j.faces/config.jsonnet @@ -8,4 +8,5 @@ "envinject", ], }, + seLinuxLevel: "s0:c39,c29", } diff --git a/instances/ee4j.faces/target/config.json b/instances/ee4j.faces/target/config.json index c1bed06f8..8a8b1e95e 100644 --- a/instances/ee4j.faces/target/config.json +++ b/instances/ee4j.faces/target/config.json @@ -217,7 +217,7 @@ "docker.io/eclipsecbi/jiro-agent-centos-7:latest" ], "context": "centos-7", - "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-centos-7: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 [ \"uid_entrypoint\", \"/usr/local/bin/jenkins-agent\" ]\n\nADD \"https://repo.jenkins-ci.org/public/org/jenkins-ci/main/remoting/3206.3208.v409508a_675ff/remoting-3206.3208.v409508a_675ff.jar\" \"/usr/share/jenkins/agent.jar\" \nADD \"https://github.com/jenkinsci/docker-agent/raw/3206.vb_15dcf73f6a_9-12/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\nUSER 10001:0\n", + "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-centos-7: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/3206.3208.v409508a_675ff/remoting-3206.3208.v409508a_675ff.jar\" \"/usr/share/jenkins/agent.jar\"\nADD \"https://github.com/jenkinsci/docker-agent/raw/3206.vb_15dcf73f6a_9-12/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\nUSER 10001:0\n", "image": "jiro-agent-centos-7", "registry": "docker.io", "repository": "eclipsecbi", @@ -316,7 +316,7 @@ "docker.io/eclipsecbi/jiro-agent-centos-8:latest" ], "context": "centos-8", - "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-centos-8: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 [ \"uid_entrypoint\", \"/usr/local/bin/jenkins-agent\" ]\n\nADD \"https://repo.jenkins-ci.org/public/org/jenkins-ci/main/remoting/3206.3208.v409508a_675ff/remoting-3206.3208.v409508a_675ff.jar\" \"/usr/share/jenkins/agent.jar\" \nADD \"https://github.com/jenkinsci/docker-agent/raw/3206.vb_15dcf73f6a_9-12/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\nUSER 10001:0\n", + "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-centos-8: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/3206.3208.v409508a_675ff/remoting-3206.3208.v409508a_675ff.jar\" \"/usr/share/jenkins/agent.jar\"\nADD \"https://github.com/jenkinsci/docker-agent/raw/3206.vb_15dcf73f6a_9-12/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\nUSER 10001:0\n", "image": "jiro-agent-centos-8", "registry": "docker.io", "repository": "eclipsecbi", @@ -406,6 +406,203 @@ }, "startupScript": "/usr/local/bin/jenkins-agent", "username": "jenkins" + }, + "ubuntu-2204": { + "agentWorkdir": "/home/jenkins/jenkins-agent", + "docker": { + "aliases": [ + "docker.io/eclipsecbi/jiro-agent-ubuntu-2204:latest" + ], + "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-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/3206.3208.v409508a_675ff/remoting-3206.3208.v409508a_675ff.jar\" \"/usr/share/jenkins/agent.jar\"\nADD \"https://github.com/jenkinsci/docker-agent/raw/3206.vb_15dcf73f6a_9-12/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\nUSER 10001:0\n", + "image": "jiro-agent-ubuntu-2204", + "registry": "docker.io", + "repository": "eclipsecbi", + "tag": "remoting-3206.3208.v409508a_675ff" + }, + "env": { + "JAVA_TOOL_OPTIONS": [ ], + "JENKINS_REMOTING_JAVA_OPTS": [ + "-showversion", + "-XshowSettings:vm", + "-Xmx256m", + "-Dorg.jenkinsci.remoting.engine.JnlpProtocol3.disabled=true", + "-Dorg.jenkinsci.plugins.gitclient.CliGitAPIImpl.useSETSID=true" + ], + "OPENJ9_JAVA_OPTIONS": [ + "-XX:+IgnoreUnrecognizedVMOptions", + "-XX:+IdleTuningCompactOnIdle", + "-XX:+IdleTuningGcOnIdle" + ], + "_JAVA_OPTIONS": [ ] + }, + "home": "/home/jenkins", + "kubernetes": { + "inheritYamlMergeStrategy": true, + "resources": { + "cpu": { + "limit": "2000m", + "request": "1000m" + }, + "memory": { + "limit": "4096Mi", + "request": "4096Mi" + } + }, + "volumes": [ + { + "mounts": [ + { + "mountPath": "/home/jenkins/.m2/settings-security.xml", + "subPath": "settings-security.xml" + }, + { + "mountPath": "/home/jenkins/.m2/settings.xml", + "subPath": "settings.xml" + } + ], + "name": "m2-secret-dir", + "secret": { + "name": "m2-secret-dir" + } + }, + { + "configMap": { + "name": "m2-dir" + }, + "mounts": [ + { + "mountPath": "/home/jenkins/.m2/toolchains.xml", + "subPath": "toolchains.xml" + }, + { + "mountPath": "/home/jenkins/.mavenrc", + "subPath": ".mavenrc" + } + ], + "name": "m2-dir" + } + ], + "yamlMergeStrategy": "merge" + }, + "labels": [ + "ubuntu-2204" + ], + "maxHeap": "256m", + "mode": "EXCLUSIVE", + "name": "ubuntu-2204", + "remoting": { + "jar": "/usr/share/jenkins/agent.jar", + "startupScript": { + "name": "jenkins-agent", + "url": "https://github.com/jenkinsci/docker-agent/raw/3206.vb_15dcf73f6a_9-12/jenkins-agent", + "version": "3206.vb_15dcf73f6a_9-12" + }, + "url": "https://repo.jenkins-ci.org/public/org/jenkins-ci/main/remoting/3206.3208.v409508a_675ff/remoting-3206.3208.v409508a_675ff.jar", + "version": "3206.3208.v409508a_675ff" + }, + "startupScript": "/usr/local/bin/jenkins-agent", + "username": "jenkins" + }, + "ubuntu-2404": { + "agentWorkdir": "/home/jenkins/jenkins-agent", + "docker": { + "aliases": [ + "docker.io/eclipsecbi/jiro-agent-ubuntu-2404:latest" + ], + "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-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/3206.3208.v409508a_675ff/remoting-3206.3208.v409508a_675ff.jar\" \"/usr/share/jenkins/agent.jar\"\nADD \"https://github.com/jenkinsci/docker-agent/raw/3206.vb_15dcf73f6a_9-12/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\nUSER 10001:0\n", + "image": "jiro-agent-ubuntu-2404", + "registry": "docker.io", + "repository": "eclipsecbi", + "tag": "remoting-3206.3208.v409508a_675ff" + }, + "env": { + "JAVA_TOOL_OPTIONS": [ ], + "JENKINS_REMOTING_JAVA_OPTS": [ + "-showversion", + "-XshowSettings:vm", + "-Xmx256m", + "-Dorg.jenkinsci.remoting.engine.JnlpProtocol3.disabled=true", + "-Dorg.jenkinsci.plugins.gitclient.CliGitAPIImpl.useSETSID=true" + ], + "OPENJ9_JAVA_OPTIONS": [ + "-XX:+IgnoreUnrecognizedVMOptions", + "-XX:+IdleTuningCompactOnIdle", + "-XX:+IdleTuningGcOnIdle" + ], + "_JAVA_OPTIONS": [ ] + }, + "home": "/home/jenkins", + "kubernetes": { + "inheritYamlMergeStrategy": true, + "resources": { + "cpu": { + "limit": "2000m", + "request": "1000m" + }, + "memory": { + "limit": "4096Mi", + "request": "4096Mi" + } + }, + "volumes": [ + { + "mounts": [ + { + "mountPath": "/home/jenkins/.m2/settings-security.xml", + "subPath": "settings-security.xml" + }, + { + "mountPath": "/home/jenkins/.m2/settings.xml", + "subPath": "settings.xml" + } + ], + "name": "m2-secret-dir", + "secret": { + "name": "m2-secret-dir" + } + }, + { + "configMap": { + "name": "m2-dir" + }, + "mounts": [ + { + "mountPath": "/home/jenkins/.m2/toolchains.xml", + "subPath": "toolchains.xml" + }, + { + "mountPath": "/home/jenkins/.mavenrc", + "subPath": ".mavenrc" + } + ], + "name": "m2-dir" + } + ], + "yamlMergeStrategy": "merge" + }, + "labels": [ + "ubuntu-latest", + "ubuntu-2404" + ], + "maxHeap": "256m", + "mode": "EXCLUSIVE", + "name": "ubuntu-2404", + "remoting": { + "jar": "/usr/share/jenkins/agent.jar", + "startupScript": { + "name": "jenkins-agent", + "url": "https://github.com/jenkinsci/docker-agent/raw/3206.vb_15dcf73f6a_9-12/jenkins-agent", + "version": "3206.vb_15dcf73f6a_9-12" + }, + "url": "https://repo.jenkins-ci.org/public/org/jenkins-ci/main/remoting/3206.3208.v409508a_675ff/remoting-3206.3208.v409508a_675ff.jar", + "version": "3206.3208.v409508a_675ff" + }, + "startupScript": "/usr/local/bin/jenkins-agent", + "username": "jenkins" } } } @@ -754,6 +951,7 @@ }, "generate": false }, + "seLinuxLevel": "s0:c39,c29", "secrets": { "dockerconfigjson": { "dockerconfigjson-for-pull-as-default": { diff --git a/instances/ee4j.faces/target/jenkins/configuration.yml b/instances/ee4j.faces/target/jenkins/configuration.yml index 48996918a..d52314983 100644 --- a/instances/ee4j.faces/target/jenkins/configuration.yml +++ b/instances/ee4j.faces/target/jenkins/configuration.yml @@ -485,6 +485,188 @@ jenkins: name: m2-dir inheritYamlMergeStrategy: "true" yamlMergeStrategy: "merge" + - name: "ubuntu-2204" + namespace: "faces" + label: "ubuntu-2204" + containers: + - name: "jnlp" + image: docker.io/eclipsecbi/jiro-agent-ubuntu-2204:remoting-3206.3208.v409508a_675ff + alwaysPullImage: true + livenessProbe: + failureThreshold: 0 + initialDelaySeconds: 0 + periodSeconds: 0 + successThreshold: 0 + timeoutSeconds: 0 + ttyEnabled: true + command: "" + args: "" + instanceCap: -1 + nodeUsageMode: EXCLUSIVE + envVars: + - envVar: + key: "JAVA_TOOL_OPTIONS" + 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" + - envVar: + key: "OPENJ9_JAVA_OPTIONS" + value: "-XX:+IgnoreUnrecognizedVMOptions -XX:+IdleTuningCompactOnIdle -XX:+IdleTuningGcOnIdle" + - envVar: + key: "_JAVA_OPTIONS" + value: "" + volumes: + - persistentVolumeClaim: + claimName: "tools-claim-jiro-faces" + mountPath: "/opt/tools" + readOnly: true + - configMapVolume: + configMapName: "known-hosts" + mountPath: "/home/jenkins/.ssh/" + subPath: "." + - emptyDirVolume: + memory: false + mountPath: "/home/jenkins/" + - emptyDirVolume: + memory: false + mountPath: "/home/jenkins/.m2/repository" + - emptyDirVolume: + memory: false + mountPath: "/home/jenkins/.m2/wrapper" + workspaceVolume: + emptyDirWorkspaceVolume: + memory: false + yaml: | + apiVersion: v1 + kind: Pod + spec: + containers: + - name: jnlp + resources: + limits: + cpu: "2000m" + memory: "4096Mi" + requests: + cpu: "1000m" + memory: "4096Mi" + volumeMounts: + - name: m2-secret-dir + mountPath: /home/jenkins/.m2/settings-security.xml + subPath: settings-security.xml + readOnly: true + - name: m2-secret-dir + mountPath: /home/jenkins/.m2/settings.xml + subPath: settings.xml + readOnly: true + - name: m2-dir + mountPath: /home/jenkins/.m2/toolchains.xml + subPath: toolchains.xml + readOnly: true + - name: m2-dir + mountPath: /home/jenkins/.mavenrc + subPath: .mavenrc + readOnly: true + volumes: + - name: m2-secret-dir + secret: + secretName: m2-secret-dir + - name: m2-dir + configMap: + name: m2-dir + inheritYamlMergeStrategy: "true" + yamlMergeStrategy: "merge" + - name: "ubuntu-2404" + namespace: "faces" + label: "ubuntu-latest ubuntu-2404" + containers: + - name: "jnlp" + image: docker.io/eclipsecbi/jiro-agent-ubuntu-2404:remoting-3206.3208.v409508a_675ff + alwaysPullImage: true + livenessProbe: + failureThreshold: 0 + initialDelaySeconds: 0 + periodSeconds: 0 + successThreshold: 0 + timeoutSeconds: 0 + ttyEnabled: true + command: "" + args: "" + instanceCap: -1 + nodeUsageMode: EXCLUSIVE + envVars: + - envVar: + key: "JAVA_TOOL_OPTIONS" + 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" + - envVar: + key: "OPENJ9_JAVA_OPTIONS" + value: "-XX:+IgnoreUnrecognizedVMOptions -XX:+IdleTuningCompactOnIdle -XX:+IdleTuningGcOnIdle" + - envVar: + key: "_JAVA_OPTIONS" + value: "" + volumes: + - persistentVolumeClaim: + claimName: "tools-claim-jiro-faces" + mountPath: "/opt/tools" + readOnly: true + - configMapVolume: + configMapName: "known-hosts" + mountPath: "/home/jenkins/.ssh/" + subPath: "." + - emptyDirVolume: + memory: false + mountPath: "/home/jenkins/" + - emptyDirVolume: + memory: false + mountPath: "/home/jenkins/.m2/repository" + - emptyDirVolume: + memory: false + mountPath: "/home/jenkins/.m2/wrapper" + workspaceVolume: + emptyDirWorkspaceVolume: + memory: false + yaml: | + apiVersion: v1 + kind: Pod + spec: + containers: + - name: jnlp + resources: + limits: + cpu: "2000m" + memory: "4096Mi" + requests: + cpu: "1000m" + memory: "4096Mi" + volumeMounts: + - name: m2-secret-dir + mountPath: /home/jenkins/.m2/settings-security.xml + subPath: settings-security.xml + readOnly: true + - name: m2-secret-dir + mountPath: /home/jenkins/.m2/settings.xml + subPath: settings.xml + readOnly: true + - name: m2-dir + mountPath: /home/jenkins/.m2/toolchains.xml + subPath: toolchains.xml + readOnly: true + - name: m2-dir + mountPath: /home/jenkins/.mavenrc + subPath: .mavenrc + readOnly: true + volumes: + - name: m2-secret-dir + secret: + secretName: m2-secret-dir + - name: m2-dir + configMap: + name: m2-dir + inheritYamlMergeStrategy: "true" + yamlMergeStrategy: "merge" security: apiToken: creationOfLegacyTokenEnabled: false @@ -579,6 +761,8 @@ tool: home: "/opt/tools/java/openjdk/latest" - name: "openjdk-ea-latest" home: "/opt/tools/java/openjdk/ea-latest" + - name: "openjdk-jdk24-latest" + home: "/opt/tools/java/openjdk/jdk-24/latest" - name: "openjdk-jdk23-latest" home: "/opt/tools/java/openjdk/jdk-23/latest" - name: "openjdk-jdk22-latest" @@ -708,6 +892,8 @@ tool: installations: - name: "apache-maven-latest" home: "/opt/tools/apache-maven/latest" + - name: "apache-maven-3.9.9" + home: "/opt/tools/apache-maven/3.9.9" - name: "apache-maven-3.9.6" home: "/opt/tools/apache-maven/3.9.6" - name: "apache-maven-3.9.5" diff --git a/instances/ee4j.faces/target/k8s/configmap-jenkins-config.yml b/instances/ee4j.faces/target/k8s/configmap-jenkins-config.yml index f96faa985..3260b7ca4 100644 --- a/instances/ee4j.faces/target/k8s/configmap-jenkins-config.yml +++ b/instances/ee4j.faces/target/k8s/configmap-jenkins-config.yml @@ -508,6 +508,188 @@ data: name: m2-dir inheritYamlMergeStrategy: "true" yamlMergeStrategy: "merge" + - name: "ubuntu-2204" + namespace: "faces" + label: "ubuntu-2204" + containers: + - name: "jnlp" + image: docker.io/eclipsecbi/jiro-agent-ubuntu-2204:remoting-3206.3208.v409508a_675ff + alwaysPullImage: true + livenessProbe: + failureThreshold: 0 + initialDelaySeconds: 0 + periodSeconds: 0 + successThreshold: 0 + timeoutSeconds: 0 + ttyEnabled: true + command: "" + args: "" + instanceCap: -1 + nodeUsageMode: EXCLUSIVE + envVars: + - envVar: + key: "JAVA_TOOL_OPTIONS" + 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" + - envVar: + key: "OPENJ9_JAVA_OPTIONS" + value: "-XX:+IgnoreUnrecognizedVMOptions -XX:+IdleTuningCompactOnIdle -XX:+IdleTuningGcOnIdle" + - envVar: + key: "_JAVA_OPTIONS" + value: "" + volumes: + - persistentVolumeClaim: + claimName: "tools-claim-jiro-faces" + mountPath: "/opt/tools" + readOnly: true + - configMapVolume: + configMapName: "known-hosts" + mountPath: "/home/jenkins/.ssh/" + subPath: "." + - emptyDirVolume: + memory: false + mountPath: "/home/jenkins/" + - emptyDirVolume: + memory: false + mountPath: "/home/jenkins/.m2/repository" + - emptyDirVolume: + memory: false + mountPath: "/home/jenkins/.m2/wrapper" + workspaceVolume: + emptyDirWorkspaceVolume: + memory: false + yaml: | + apiVersion: v1 + kind: Pod + spec: + containers: + - name: jnlp + resources: + limits: + cpu: "2000m" + memory: "4096Mi" + requests: + cpu: "1000m" + memory: "4096Mi" + volumeMounts: + - name: m2-secret-dir + mountPath: /home/jenkins/.m2/settings-security.xml + subPath: settings-security.xml + readOnly: true + - name: m2-secret-dir + mountPath: /home/jenkins/.m2/settings.xml + subPath: settings.xml + readOnly: true + - name: m2-dir + mountPath: /home/jenkins/.m2/toolchains.xml + subPath: toolchains.xml + readOnly: true + - name: m2-dir + mountPath: /home/jenkins/.mavenrc + subPath: .mavenrc + readOnly: true + volumes: + - name: m2-secret-dir + secret: + secretName: m2-secret-dir + - name: m2-dir + configMap: + name: m2-dir + inheritYamlMergeStrategy: "true" + yamlMergeStrategy: "merge" + - name: "ubuntu-2404" + namespace: "faces" + label: "ubuntu-latest ubuntu-2404" + containers: + - name: "jnlp" + image: docker.io/eclipsecbi/jiro-agent-ubuntu-2404:remoting-3206.3208.v409508a_675ff + alwaysPullImage: true + livenessProbe: + failureThreshold: 0 + initialDelaySeconds: 0 + periodSeconds: 0 + successThreshold: 0 + timeoutSeconds: 0 + ttyEnabled: true + command: "" + args: "" + instanceCap: -1 + nodeUsageMode: EXCLUSIVE + envVars: + - envVar: + key: "JAVA_TOOL_OPTIONS" + 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" + - envVar: + key: "OPENJ9_JAVA_OPTIONS" + value: "-XX:+IgnoreUnrecognizedVMOptions -XX:+IdleTuningCompactOnIdle -XX:+IdleTuningGcOnIdle" + - envVar: + key: "_JAVA_OPTIONS" + value: "" + volumes: + - persistentVolumeClaim: + claimName: "tools-claim-jiro-faces" + mountPath: "/opt/tools" + readOnly: true + - configMapVolume: + configMapName: "known-hosts" + mountPath: "/home/jenkins/.ssh/" + subPath: "." + - emptyDirVolume: + memory: false + mountPath: "/home/jenkins/" + - emptyDirVolume: + memory: false + mountPath: "/home/jenkins/.m2/repository" + - emptyDirVolume: + memory: false + mountPath: "/home/jenkins/.m2/wrapper" + workspaceVolume: + emptyDirWorkspaceVolume: + memory: false + yaml: | + apiVersion: v1 + kind: Pod + spec: + containers: + - name: jnlp + resources: + limits: + cpu: "2000m" + memory: "4096Mi" + requests: + cpu: "1000m" + memory: "4096Mi" + volumeMounts: + - name: m2-secret-dir + mountPath: /home/jenkins/.m2/settings-security.xml + subPath: settings-security.xml + readOnly: true + - name: m2-secret-dir + mountPath: /home/jenkins/.m2/settings.xml + subPath: settings.xml + readOnly: true + - name: m2-dir + mountPath: /home/jenkins/.m2/toolchains.xml + subPath: toolchains.xml + readOnly: true + - name: m2-dir + mountPath: /home/jenkins/.mavenrc + subPath: .mavenrc + readOnly: true + volumes: + - name: m2-secret-dir + secret: + secretName: m2-secret-dir + - name: m2-dir + configMap: + name: m2-dir + inheritYamlMergeStrategy: "true" + yamlMergeStrategy: "merge" security: apiToken: creationOfLegacyTokenEnabled: false @@ -602,6 +784,8 @@ data: home: "/opt/tools/java/openjdk/latest" - name: "openjdk-ea-latest" home: "/opt/tools/java/openjdk/ea-latest" + - name: "openjdk-jdk24-latest" + home: "/opt/tools/java/openjdk/jdk-24/latest" - name: "openjdk-jdk23-latest" home: "/opt/tools/java/openjdk/jdk-23/latest" - name: "openjdk-jdk22-latest" @@ -731,6 +915,8 @@ data: installations: - name: "apache-maven-latest" home: "/opt/tools/apache-maven/latest" + - name: "apache-maven-3.9.9" + home: "/opt/tools/apache-maven/3.9.9" - name: "apache-maven-3.9.6" home: "/opt/tools/apache-maven/3.9.6" - name: "apache-maven-3.9.5" diff --git a/instances/ee4j.faces/target/k8s/m2-dir.json b/instances/ee4j.faces/target/k8s/m2-dir.json index 358830665..4302c654d 100644 --- a/instances/ee4j.faces/target/k8s/m2-dir.json +++ b/instances/ee4j.faces/target/k8s/m2-dir.json @@ -2,7 +2,7 @@ "apiVersion": "v1", "data": { ".mavenrc": "set -- -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn --batch-mode \"${@}\"", - "toolchains.xml": "\n\n \n jdk\n \n JavaSE-1.8\n 1.8\n oracle\n \n /opt/tools/java/oracle/jdk-8/latest\n \n \n jdk\n \n JavaSE-9\n 9\n openjdk\n \n /opt/tools/java/openjdk/jdk-9/latest\n \n \n jdk\n \n JavaSE-10\n 10\n openjdk\n \n /opt/tools/java/openjdk/jdk-10/latest\n \n \n jdk\n \n JavaSE-11\n 11\n openjdk\n \n /opt/tools/java/openjdk/jdk-11/latest\n \n \n jdk\n \n JavaSE-12\n 12\n openjdk\n \n /opt/tools/java/openjdk/jdk-12/latest\n \n \n jdk\n \n JavaSE-13\n 13\n openjdk\n \n /opt/tools/java/openjdk/jdk-13/latest\n \n \n jdk\n \n JavaSE-14\n 14\n openjdk\n \n /opt/tools/java/openjdk/jdk-14/latest\n \n \n jdk\n \n JavaSE-15\n 15\n openjdk\n \n /opt/tools/java/openjdk/jdk-15/latest\n \n \n jdk\n \n JavaSE-16\n 16\n openjdk\n \n /opt/tools/java/openjdk/jdk-16/latest\n \n \n jdk\n \n JavaSE-17\n 17\n openjdk\n \n /opt/tools/java/openjdk/jdk-17/latest\n \n \n jdk\n \n JavaSE-18\n 18\n openjdk\n \n /opt/tools/java/openjdk/jdk-18/latest\n \n \n jdk\n \n JavaSE-19\n 19\n openjdk\n \n /opt/tools/java/openjdk/jdk-19/latest\n \n \n jdk\n \n JavaSE-20\n 20\n openjdk\n \n /opt/tools/java/openjdk/jdk-20/latest\n \n \n jdk\n \n JavaSE-21\n 21\n openjdk\n \n /opt/tools/java/openjdk/jdk-21/latest\n \n \n jdk\n \n JavaSE-22\n 22\n openjdk\n \n /opt/tools/java/openjdk/jdk-22/latest\n \n \n jdk\n \n JavaSE-23\n 23\n openjdk\n \n /opt/tools/java/openjdk/jdk-23/latest\n \n\n" + "toolchains.xml": "\n\n \n jdk\n \n JavaSE-1.8\n 1.8\n oracle\n \n /opt/tools/java/oracle/jdk-8/latest\n \n \n jdk\n \n JavaSE-9\n 9\n openjdk\n \n /opt/tools/java/openjdk/jdk-9/latest\n \n \n jdk\n \n JavaSE-10\n 10\n openjdk\n \n /opt/tools/java/openjdk/jdk-10/latest\n \n \n jdk\n \n JavaSE-11\n 11\n openjdk\n \n /opt/tools/java/openjdk/jdk-11/latest\n \n \n jdk\n \n JavaSE-12\n 12\n openjdk\n \n /opt/tools/java/openjdk/jdk-12/latest\n \n \n jdk\n \n JavaSE-13\n 13\n openjdk\n \n /opt/tools/java/openjdk/jdk-13/latest\n \n \n jdk\n \n JavaSE-14\n 14\n openjdk\n \n /opt/tools/java/openjdk/jdk-14/latest\n \n \n jdk\n \n JavaSE-15\n 15\n openjdk\n \n /opt/tools/java/openjdk/jdk-15/latest\n \n \n jdk\n \n JavaSE-16\n 16\n openjdk\n \n /opt/tools/java/openjdk/jdk-16/latest\n \n \n jdk\n \n JavaSE-17\n 17\n openjdk\n \n /opt/tools/java/openjdk/jdk-17/latest\n \n \n jdk\n \n JavaSE-18\n 18\n openjdk\n \n /opt/tools/java/openjdk/jdk-18/latest\n \n \n jdk\n \n JavaSE-19\n 19\n openjdk\n \n /opt/tools/java/openjdk/jdk-19/latest\n \n \n jdk\n \n JavaSE-20\n 20\n openjdk\n \n /opt/tools/java/openjdk/jdk-20/latest\n \n \n jdk\n \n JavaSE-21\n 21\n openjdk\n \n /opt/tools/java/openjdk/jdk-21/latest\n \n \n jdk\n \n JavaSE-22\n 22\n openjdk\n \n /opt/tools/java/openjdk/jdk-22/latest\n \n \n jdk\n \n JavaSE-23\n 23\n openjdk\n \n /opt/tools/java/openjdk/jdk-23/latest\n \n \n jdk\n \n JavaSE-24\n 24\n openjdk\n \n /opt/tools/java/openjdk/jdk-24/latest\n \n\n" }, "kind": "ConfigMap", "metadata": { diff --git a/instances/ee4j.faces/target/k8s/statefulset.json b/instances/ee4j.faces/target/k8s/statefulset.json index 36ecbf2a5..cf2866ea4 100644 --- a/instances/ee4j.faces/target/k8s/statefulset.json +++ b/instances/ee4j.faces/target/k8s/statefulset.json @@ -119,6 +119,12 @@ "cpu": "250m" } }, + "securityContext": { + "seLinuxOptions": { + "level": "s0:c39,c29", + "type": "spc_t" + } + }, "volumeMounts": [ { "mountPath": "/var/jenkins", diff --git a/instances/ee4j.interceptors/config.jsonnet b/instances/ee4j.interceptors/config.jsonnet index ffd34ce34..4ccbc755b 100644 --- a/instances/ee4j.interceptors/config.jsonnet +++ b/instances/ee4j.interceptors/config.jsonnet @@ -3,4 +3,5 @@ fullName: "ee4j.interceptors", displayName: "Jakarta Interceptors", }, + seLinuxLevel: "s0:c42,c9", } diff --git a/instances/ee4j.interceptors/target/config.json b/instances/ee4j.interceptors/target/config.json index 10a7895ab..60423dbeb 100644 --- a/instances/ee4j.interceptors/target/config.json +++ b/instances/ee4j.interceptors/target/config.json @@ -217,7 +217,7 @@ "docker.io/eclipsecbi/jiro-agent-centos-7:latest" ], "context": "centos-7", - "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-centos-7: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 [ \"uid_entrypoint\", \"/usr/local/bin/jenkins-agent\" ]\n\nADD \"https://repo.jenkins-ci.org/public/org/jenkins-ci/main/remoting/3206.3208.v409508a_675ff/remoting-3206.3208.v409508a_675ff.jar\" \"/usr/share/jenkins/agent.jar\" \nADD \"https://github.com/jenkinsci/docker-agent/raw/3206.vb_15dcf73f6a_9-12/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\nUSER 10001:0\n", + "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-centos-7: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/3206.3208.v409508a_675ff/remoting-3206.3208.v409508a_675ff.jar\" \"/usr/share/jenkins/agent.jar\"\nADD \"https://github.com/jenkinsci/docker-agent/raw/3206.vb_15dcf73f6a_9-12/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\nUSER 10001:0\n", "image": "jiro-agent-centos-7", "registry": "docker.io", "repository": "eclipsecbi", @@ -316,7 +316,7 @@ "docker.io/eclipsecbi/jiro-agent-centos-8:latest" ], "context": "centos-8", - "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-centos-8: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 [ \"uid_entrypoint\", \"/usr/local/bin/jenkins-agent\" ]\n\nADD \"https://repo.jenkins-ci.org/public/org/jenkins-ci/main/remoting/3206.3208.v409508a_675ff/remoting-3206.3208.v409508a_675ff.jar\" \"/usr/share/jenkins/agent.jar\" \nADD \"https://github.com/jenkinsci/docker-agent/raw/3206.vb_15dcf73f6a_9-12/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\nUSER 10001:0\n", + "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-centos-8: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/3206.3208.v409508a_675ff/remoting-3206.3208.v409508a_675ff.jar\" \"/usr/share/jenkins/agent.jar\"\nADD \"https://github.com/jenkinsci/docker-agent/raw/3206.vb_15dcf73f6a_9-12/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\nUSER 10001:0\n", "image": "jiro-agent-centos-8", "registry": "docker.io", "repository": "eclipsecbi", @@ -406,6 +406,203 @@ }, "startupScript": "/usr/local/bin/jenkins-agent", "username": "jenkins" + }, + "ubuntu-2204": { + "agentWorkdir": "/home/jenkins/jenkins-agent", + "docker": { + "aliases": [ + "docker.io/eclipsecbi/jiro-agent-ubuntu-2204:latest" + ], + "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-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/3206.3208.v409508a_675ff/remoting-3206.3208.v409508a_675ff.jar\" \"/usr/share/jenkins/agent.jar\"\nADD \"https://github.com/jenkinsci/docker-agent/raw/3206.vb_15dcf73f6a_9-12/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\nUSER 10001:0\n", + "image": "jiro-agent-ubuntu-2204", + "registry": "docker.io", + "repository": "eclipsecbi", + "tag": "remoting-3206.3208.v409508a_675ff" + }, + "env": { + "JAVA_TOOL_OPTIONS": [ ], + "JENKINS_REMOTING_JAVA_OPTS": [ + "-showversion", + "-XshowSettings:vm", + "-Xmx256m", + "-Dorg.jenkinsci.remoting.engine.JnlpProtocol3.disabled=true", + "-Dorg.jenkinsci.plugins.gitclient.CliGitAPIImpl.useSETSID=true" + ], + "OPENJ9_JAVA_OPTIONS": [ + "-XX:+IgnoreUnrecognizedVMOptions", + "-XX:+IdleTuningCompactOnIdle", + "-XX:+IdleTuningGcOnIdle" + ], + "_JAVA_OPTIONS": [ ] + }, + "home": "/home/jenkins", + "kubernetes": { + "inheritYamlMergeStrategy": true, + "resources": { + "cpu": { + "limit": "2000m", + "request": "1000m" + }, + "memory": { + "limit": "4096Mi", + "request": "4096Mi" + } + }, + "volumes": [ + { + "mounts": [ + { + "mountPath": "/home/jenkins/.m2/settings-security.xml", + "subPath": "settings-security.xml" + }, + { + "mountPath": "/home/jenkins/.m2/settings.xml", + "subPath": "settings.xml" + } + ], + "name": "m2-secret-dir", + "secret": { + "name": "m2-secret-dir" + } + }, + { + "configMap": { + "name": "m2-dir" + }, + "mounts": [ + { + "mountPath": "/home/jenkins/.m2/toolchains.xml", + "subPath": "toolchains.xml" + }, + { + "mountPath": "/home/jenkins/.mavenrc", + "subPath": ".mavenrc" + } + ], + "name": "m2-dir" + } + ], + "yamlMergeStrategy": "merge" + }, + "labels": [ + "ubuntu-2204" + ], + "maxHeap": "256m", + "mode": "EXCLUSIVE", + "name": "ubuntu-2204", + "remoting": { + "jar": "/usr/share/jenkins/agent.jar", + "startupScript": { + "name": "jenkins-agent", + "url": "https://github.com/jenkinsci/docker-agent/raw/3206.vb_15dcf73f6a_9-12/jenkins-agent", + "version": "3206.vb_15dcf73f6a_9-12" + }, + "url": "https://repo.jenkins-ci.org/public/org/jenkins-ci/main/remoting/3206.3208.v409508a_675ff/remoting-3206.3208.v409508a_675ff.jar", + "version": "3206.3208.v409508a_675ff" + }, + "startupScript": "/usr/local/bin/jenkins-agent", + "username": "jenkins" + }, + "ubuntu-2404": { + "agentWorkdir": "/home/jenkins/jenkins-agent", + "docker": { + "aliases": [ + "docker.io/eclipsecbi/jiro-agent-ubuntu-2404:latest" + ], + "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-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/3206.3208.v409508a_675ff/remoting-3206.3208.v409508a_675ff.jar\" \"/usr/share/jenkins/agent.jar\"\nADD \"https://github.com/jenkinsci/docker-agent/raw/3206.vb_15dcf73f6a_9-12/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\nUSER 10001:0\n", + "image": "jiro-agent-ubuntu-2404", + "registry": "docker.io", + "repository": "eclipsecbi", + "tag": "remoting-3206.3208.v409508a_675ff" + }, + "env": { + "JAVA_TOOL_OPTIONS": [ ], + "JENKINS_REMOTING_JAVA_OPTS": [ + "-showversion", + "-XshowSettings:vm", + "-Xmx256m", + "-Dorg.jenkinsci.remoting.engine.JnlpProtocol3.disabled=true", + "-Dorg.jenkinsci.plugins.gitclient.CliGitAPIImpl.useSETSID=true" + ], + "OPENJ9_JAVA_OPTIONS": [ + "-XX:+IgnoreUnrecognizedVMOptions", + "-XX:+IdleTuningCompactOnIdle", + "-XX:+IdleTuningGcOnIdle" + ], + "_JAVA_OPTIONS": [ ] + }, + "home": "/home/jenkins", + "kubernetes": { + "inheritYamlMergeStrategy": true, + "resources": { + "cpu": { + "limit": "2000m", + "request": "1000m" + }, + "memory": { + "limit": "4096Mi", + "request": "4096Mi" + } + }, + "volumes": [ + { + "mounts": [ + { + "mountPath": "/home/jenkins/.m2/settings-security.xml", + "subPath": "settings-security.xml" + }, + { + "mountPath": "/home/jenkins/.m2/settings.xml", + "subPath": "settings.xml" + } + ], + "name": "m2-secret-dir", + "secret": { + "name": "m2-secret-dir" + } + }, + { + "configMap": { + "name": "m2-dir" + }, + "mounts": [ + { + "mountPath": "/home/jenkins/.m2/toolchains.xml", + "subPath": "toolchains.xml" + }, + { + "mountPath": "/home/jenkins/.mavenrc", + "subPath": ".mavenrc" + } + ], + "name": "m2-dir" + } + ], + "yamlMergeStrategy": "merge" + }, + "labels": [ + "ubuntu-latest", + "ubuntu-2404" + ], + "maxHeap": "256m", + "mode": "EXCLUSIVE", + "name": "ubuntu-2404", + "remoting": { + "jar": "/usr/share/jenkins/agent.jar", + "startupScript": { + "name": "jenkins-agent", + "url": "https://github.com/jenkinsci/docker-agent/raw/3206.vb_15dcf73f6a_9-12/jenkins-agent", + "version": "3206.vb_15dcf73f6a_9-12" + }, + "url": "https://repo.jenkins-ci.org/public/org/jenkins-ci/main/remoting/3206.3208.v409508a_675ff/remoting-3206.3208.v409508a_675ff.jar", + "version": "3206.3208.v409508a_675ff" + }, + "startupScript": "/usr/local/bin/jenkins-agent", + "username": "jenkins" } } } @@ -753,6 +950,7 @@ }, "generate": false }, + "seLinuxLevel": "s0:c42,c9", "secrets": { "dockerconfigjson": { "dockerconfigjson-for-pull-as-default": { diff --git a/instances/ee4j.interceptors/target/jenkins/configuration.yml b/instances/ee4j.interceptors/target/jenkins/configuration.yml index 82498a68c..19e17f586 100644 --- a/instances/ee4j.interceptors/target/jenkins/configuration.yml +++ b/instances/ee4j.interceptors/target/jenkins/configuration.yml @@ -485,6 +485,188 @@ jenkins: name: m2-dir inheritYamlMergeStrategy: "true" yamlMergeStrategy: "merge" + - name: "ubuntu-2204" + namespace: "interceptors" + label: "ubuntu-2204" + containers: + - name: "jnlp" + image: docker.io/eclipsecbi/jiro-agent-ubuntu-2204:remoting-3206.3208.v409508a_675ff + alwaysPullImage: true + livenessProbe: + failureThreshold: 0 + initialDelaySeconds: 0 + periodSeconds: 0 + successThreshold: 0 + timeoutSeconds: 0 + ttyEnabled: true + command: "" + args: "" + instanceCap: -1 + nodeUsageMode: EXCLUSIVE + envVars: + - envVar: + key: "JAVA_TOOL_OPTIONS" + 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" + - envVar: + key: "OPENJ9_JAVA_OPTIONS" + value: "-XX:+IgnoreUnrecognizedVMOptions -XX:+IdleTuningCompactOnIdle -XX:+IdleTuningGcOnIdle" + - envVar: + key: "_JAVA_OPTIONS" + value: "" + volumes: + - persistentVolumeClaim: + claimName: "tools-claim-jiro-interceptors" + mountPath: "/opt/tools" + readOnly: true + - configMapVolume: + configMapName: "known-hosts" + mountPath: "/home/jenkins/.ssh/" + subPath: "." + - emptyDirVolume: + memory: false + mountPath: "/home/jenkins/" + - emptyDirVolume: + memory: false + mountPath: "/home/jenkins/.m2/repository" + - emptyDirVolume: + memory: false + mountPath: "/home/jenkins/.m2/wrapper" + workspaceVolume: + emptyDirWorkspaceVolume: + memory: false + yaml: | + apiVersion: v1 + kind: Pod + spec: + containers: + - name: jnlp + resources: + limits: + cpu: "2000m" + memory: "4096Mi" + requests: + cpu: "1000m" + memory: "4096Mi" + volumeMounts: + - name: m2-secret-dir + mountPath: /home/jenkins/.m2/settings-security.xml + subPath: settings-security.xml + readOnly: true + - name: m2-secret-dir + mountPath: /home/jenkins/.m2/settings.xml + subPath: settings.xml + readOnly: true + - name: m2-dir + mountPath: /home/jenkins/.m2/toolchains.xml + subPath: toolchains.xml + readOnly: true + - name: m2-dir + mountPath: /home/jenkins/.mavenrc + subPath: .mavenrc + readOnly: true + volumes: + - name: m2-secret-dir + secret: + secretName: m2-secret-dir + - name: m2-dir + configMap: + name: m2-dir + inheritYamlMergeStrategy: "true" + yamlMergeStrategy: "merge" + - name: "ubuntu-2404" + namespace: "interceptors" + label: "ubuntu-latest ubuntu-2404" + containers: + - name: "jnlp" + image: docker.io/eclipsecbi/jiro-agent-ubuntu-2404:remoting-3206.3208.v409508a_675ff + alwaysPullImage: true + livenessProbe: + failureThreshold: 0 + initialDelaySeconds: 0 + periodSeconds: 0 + successThreshold: 0 + timeoutSeconds: 0 + ttyEnabled: true + command: "" + args: "" + instanceCap: -1 + nodeUsageMode: EXCLUSIVE + envVars: + - envVar: + key: "JAVA_TOOL_OPTIONS" + 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" + - envVar: + key: "OPENJ9_JAVA_OPTIONS" + value: "-XX:+IgnoreUnrecognizedVMOptions -XX:+IdleTuningCompactOnIdle -XX:+IdleTuningGcOnIdle" + - envVar: + key: "_JAVA_OPTIONS" + value: "" + volumes: + - persistentVolumeClaim: + claimName: "tools-claim-jiro-interceptors" + mountPath: "/opt/tools" + readOnly: true + - configMapVolume: + configMapName: "known-hosts" + mountPath: "/home/jenkins/.ssh/" + subPath: "." + - emptyDirVolume: + memory: false + mountPath: "/home/jenkins/" + - emptyDirVolume: + memory: false + mountPath: "/home/jenkins/.m2/repository" + - emptyDirVolume: + memory: false + mountPath: "/home/jenkins/.m2/wrapper" + workspaceVolume: + emptyDirWorkspaceVolume: + memory: false + yaml: | + apiVersion: v1 + kind: Pod + spec: + containers: + - name: jnlp + resources: + limits: + cpu: "2000m" + memory: "4096Mi" + requests: + cpu: "1000m" + memory: "4096Mi" + volumeMounts: + - name: m2-secret-dir + mountPath: /home/jenkins/.m2/settings-security.xml + subPath: settings-security.xml + readOnly: true + - name: m2-secret-dir + mountPath: /home/jenkins/.m2/settings.xml + subPath: settings.xml + readOnly: true + - name: m2-dir + mountPath: /home/jenkins/.m2/toolchains.xml + subPath: toolchains.xml + readOnly: true + - name: m2-dir + mountPath: /home/jenkins/.mavenrc + subPath: .mavenrc + readOnly: true + volumes: + - name: m2-secret-dir + secret: + secretName: m2-secret-dir + - name: m2-dir + configMap: + name: m2-dir + inheritYamlMergeStrategy: "true" + yamlMergeStrategy: "merge" security: apiToken: creationOfLegacyTokenEnabled: false @@ -579,6 +761,8 @@ tool: home: "/opt/tools/java/openjdk/latest" - name: "openjdk-ea-latest" home: "/opt/tools/java/openjdk/ea-latest" + - name: "openjdk-jdk24-latest" + home: "/opt/tools/java/openjdk/jdk-24/latest" - name: "openjdk-jdk23-latest" home: "/opt/tools/java/openjdk/jdk-23/latest" - name: "openjdk-jdk22-latest" @@ -708,6 +892,8 @@ tool: installations: - name: "apache-maven-latest" home: "/opt/tools/apache-maven/latest" + - name: "apache-maven-3.9.9" + home: "/opt/tools/apache-maven/3.9.9" - name: "apache-maven-3.9.6" home: "/opt/tools/apache-maven/3.9.6" - name: "apache-maven-3.9.5" diff --git a/instances/ee4j.interceptors/target/k8s/configmap-jenkins-config.yml b/instances/ee4j.interceptors/target/k8s/configmap-jenkins-config.yml index 13b58b453..2df2ec128 100644 --- a/instances/ee4j.interceptors/target/k8s/configmap-jenkins-config.yml +++ b/instances/ee4j.interceptors/target/k8s/configmap-jenkins-config.yml @@ -508,6 +508,188 @@ data: name: m2-dir inheritYamlMergeStrategy: "true" yamlMergeStrategy: "merge" + - name: "ubuntu-2204" + namespace: "interceptors" + label: "ubuntu-2204" + containers: + - name: "jnlp" + image: docker.io/eclipsecbi/jiro-agent-ubuntu-2204:remoting-3206.3208.v409508a_675ff + alwaysPullImage: true + livenessProbe: + failureThreshold: 0 + initialDelaySeconds: 0 + periodSeconds: 0 + successThreshold: 0 + timeoutSeconds: 0 + ttyEnabled: true + command: "" + args: "" + instanceCap: -1 + nodeUsageMode: EXCLUSIVE + envVars: + - envVar: + key: "JAVA_TOOL_OPTIONS" + 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" + - envVar: + key: "OPENJ9_JAVA_OPTIONS" + value: "-XX:+IgnoreUnrecognizedVMOptions -XX:+IdleTuningCompactOnIdle -XX:+IdleTuningGcOnIdle" + - envVar: + key: "_JAVA_OPTIONS" + value: "" + volumes: + - persistentVolumeClaim: + claimName: "tools-claim-jiro-interceptors" + mountPath: "/opt/tools" + readOnly: true + - configMapVolume: + configMapName: "known-hosts" + mountPath: "/home/jenkins/.ssh/" + subPath: "." + - emptyDirVolume: + memory: false + mountPath: "/home/jenkins/" + - emptyDirVolume: + memory: false + mountPath: "/home/jenkins/.m2/repository" + - emptyDirVolume: + memory: false + mountPath: "/home/jenkins/.m2/wrapper" + workspaceVolume: + emptyDirWorkspaceVolume: + memory: false + yaml: | + apiVersion: v1 + kind: Pod + spec: + containers: + - name: jnlp + resources: + limits: + cpu: "2000m" + memory: "4096Mi" + requests: + cpu: "1000m" + memory: "4096Mi" + volumeMounts: + - name: m2-secret-dir + mountPath: /home/jenkins/.m2/settings-security.xml + subPath: settings-security.xml + readOnly: true + - name: m2-secret-dir + mountPath: /home/jenkins/.m2/settings.xml + subPath: settings.xml + readOnly: true + - name: m2-dir + mountPath: /home/jenkins/.m2/toolchains.xml + subPath: toolchains.xml + readOnly: true + - name: m2-dir + mountPath: /home/jenkins/.mavenrc + subPath: .mavenrc + readOnly: true + volumes: + - name: m2-secret-dir + secret: + secretName: m2-secret-dir + - name: m2-dir + configMap: + name: m2-dir + inheritYamlMergeStrategy: "true" + yamlMergeStrategy: "merge" + - name: "ubuntu-2404" + namespace: "interceptors" + label: "ubuntu-latest ubuntu-2404" + containers: + - name: "jnlp" + image: docker.io/eclipsecbi/jiro-agent-ubuntu-2404:remoting-3206.3208.v409508a_675ff + alwaysPullImage: true + livenessProbe: + failureThreshold: 0 + initialDelaySeconds: 0 + periodSeconds: 0 + successThreshold: 0 + timeoutSeconds: 0 + ttyEnabled: true + command: "" + args: "" + instanceCap: -1 + nodeUsageMode: EXCLUSIVE + envVars: + - envVar: + key: "JAVA_TOOL_OPTIONS" + 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" + - envVar: + key: "OPENJ9_JAVA_OPTIONS" + value: "-XX:+IgnoreUnrecognizedVMOptions -XX:+IdleTuningCompactOnIdle -XX:+IdleTuningGcOnIdle" + - envVar: + key: "_JAVA_OPTIONS" + value: "" + volumes: + - persistentVolumeClaim: + claimName: "tools-claim-jiro-interceptors" + mountPath: "/opt/tools" + readOnly: true + - configMapVolume: + configMapName: "known-hosts" + mountPath: "/home/jenkins/.ssh/" + subPath: "." + - emptyDirVolume: + memory: false + mountPath: "/home/jenkins/" + - emptyDirVolume: + memory: false + mountPath: "/home/jenkins/.m2/repository" + - emptyDirVolume: + memory: false + mountPath: "/home/jenkins/.m2/wrapper" + workspaceVolume: + emptyDirWorkspaceVolume: + memory: false + yaml: | + apiVersion: v1 + kind: Pod + spec: + containers: + - name: jnlp + resources: + limits: + cpu: "2000m" + memory: "4096Mi" + requests: + cpu: "1000m" + memory: "4096Mi" + volumeMounts: + - name: m2-secret-dir + mountPath: /home/jenkins/.m2/settings-security.xml + subPath: settings-security.xml + readOnly: true + - name: m2-secret-dir + mountPath: /home/jenkins/.m2/settings.xml + subPath: settings.xml + readOnly: true + - name: m2-dir + mountPath: /home/jenkins/.m2/toolchains.xml + subPath: toolchains.xml + readOnly: true + - name: m2-dir + mountPath: /home/jenkins/.mavenrc + subPath: .mavenrc + readOnly: true + volumes: + - name: m2-secret-dir + secret: + secretName: m2-secret-dir + - name: m2-dir + configMap: + name: m2-dir + inheritYamlMergeStrategy: "true" + yamlMergeStrategy: "merge" security: apiToken: creationOfLegacyTokenEnabled: false @@ -602,6 +784,8 @@ data: home: "/opt/tools/java/openjdk/latest" - name: "openjdk-ea-latest" home: "/opt/tools/java/openjdk/ea-latest" + - name: "openjdk-jdk24-latest" + home: "/opt/tools/java/openjdk/jdk-24/latest" - name: "openjdk-jdk23-latest" home: "/opt/tools/java/openjdk/jdk-23/latest" - name: "openjdk-jdk22-latest" @@ -731,6 +915,8 @@ data: installations: - name: "apache-maven-latest" home: "/opt/tools/apache-maven/latest" + - name: "apache-maven-3.9.9" + home: "/opt/tools/apache-maven/3.9.9" - name: "apache-maven-3.9.6" home: "/opt/tools/apache-maven/3.9.6" - name: "apache-maven-3.9.5" diff --git a/instances/ee4j.interceptors/target/k8s/m2-dir.json b/instances/ee4j.interceptors/target/k8s/m2-dir.json index 5b551e7bf..99b3afdae 100644 --- a/instances/ee4j.interceptors/target/k8s/m2-dir.json +++ b/instances/ee4j.interceptors/target/k8s/m2-dir.json @@ -2,7 +2,7 @@ "apiVersion": "v1", "data": { ".mavenrc": "set -- -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn --batch-mode \"${@}\"", - "toolchains.xml": "\n\n \n jdk\n \n JavaSE-1.8\n 1.8\n oracle\n \n /opt/tools/java/oracle/jdk-8/latest\n \n \n jdk\n \n JavaSE-9\n 9\n openjdk\n \n /opt/tools/java/openjdk/jdk-9/latest\n \n \n jdk\n \n JavaSE-10\n 10\n openjdk\n \n /opt/tools/java/openjdk/jdk-10/latest\n \n \n jdk\n \n JavaSE-11\n 11\n openjdk\n \n /opt/tools/java/openjdk/jdk-11/latest\n \n \n jdk\n \n JavaSE-12\n 12\n openjdk\n \n /opt/tools/java/openjdk/jdk-12/latest\n \n \n jdk\n \n JavaSE-13\n 13\n openjdk\n \n /opt/tools/java/openjdk/jdk-13/latest\n \n \n jdk\n \n JavaSE-14\n 14\n openjdk\n \n /opt/tools/java/openjdk/jdk-14/latest\n \n \n jdk\n \n JavaSE-15\n 15\n openjdk\n \n /opt/tools/java/openjdk/jdk-15/latest\n \n \n jdk\n \n JavaSE-16\n 16\n openjdk\n \n /opt/tools/java/openjdk/jdk-16/latest\n \n \n jdk\n \n JavaSE-17\n 17\n openjdk\n \n /opt/tools/java/openjdk/jdk-17/latest\n \n \n jdk\n \n JavaSE-18\n 18\n openjdk\n \n /opt/tools/java/openjdk/jdk-18/latest\n \n \n jdk\n \n JavaSE-19\n 19\n openjdk\n \n /opt/tools/java/openjdk/jdk-19/latest\n \n \n jdk\n \n JavaSE-20\n 20\n openjdk\n \n /opt/tools/java/openjdk/jdk-20/latest\n \n \n jdk\n \n JavaSE-21\n 21\n openjdk\n \n /opt/tools/java/openjdk/jdk-21/latest\n \n \n jdk\n \n JavaSE-22\n 22\n openjdk\n \n /opt/tools/java/openjdk/jdk-22/latest\n \n \n jdk\n \n JavaSE-23\n 23\n openjdk\n \n /opt/tools/java/openjdk/jdk-23/latest\n \n\n" + "toolchains.xml": "\n\n \n jdk\n \n JavaSE-1.8\n 1.8\n oracle\n \n /opt/tools/java/oracle/jdk-8/latest\n \n \n jdk\n \n JavaSE-9\n 9\n openjdk\n \n /opt/tools/java/openjdk/jdk-9/latest\n \n \n jdk\n \n JavaSE-10\n 10\n openjdk\n \n /opt/tools/java/openjdk/jdk-10/latest\n \n \n jdk\n \n JavaSE-11\n 11\n openjdk\n \n /opt/tools/java/openjdk/jdk-11/latest\n \n \n jdk\n \n JavaSE-12\n 12\n openjdk\n \n /opt/tools/java/openjdk/jdk-12/latest\n \n \n jdk\n \n JavaSE-13\n 13\n openjdk\n \n /opt/tools/java/openjdk/jdk-13/latest\n \n \n jdk\n \n JavaSE-14\n 14\n openjdk\n \n /opt/tools/java/openjdk/jdk-14/latest\n \n \n jdk\n \n JavaSE-15\n 15\n openjdk\n \n /opt/tools/java/openjdk/jdk-15/latest\n \n \n jdk\n \n JavaSE-16\n 16\n openjdk\n \n /opt/tools/java/openjdk/jdk-16/latest\n \n \n jdk\n \n JavaSE-17\n 17\n openjdk\n \n /opt/tools/java/openjdk/jdk-17/latest\n \n \n jdk\n \n JavaSE-18\n 18\n openjdk\n \n /opt/tools/java/openjdk/jdk-18/latest\n \n \n jdk\n \n JavaSE-19\n 19\n openjdk\n \n /opt/tools/java/openjdk/jdk-19/latest\n \n \n jdk\n \n JavaSE-20\n 20\n openjdk\n \n /opt/tools/java/openjdk/jdk-20/latest\n \n \n jdk\n \n JavaSE-21\n 21\n openjdk\n \n /opt/tools/java/openjdk/jdk-21/latest\n \n \n jdk\n \n JavaSE-22\n 22\n openjdk\n \n /opt/tools/java/openjdk/jdk-22/latest\n \n \n jdk\n \n JavaSE-23\n 23\n openjdk\n \n /opt/tools/java/openjdk/jdk-23/latest\n \n \n jdk\n \n JavaSE-24\n 24\n openjdk\n \n /opt/tools/java/openjdk/jdk-24/latest\n \n\n" }, "kind": "ConfigMap", "metadata": { diff --git a/instances/ee4j.interceptors/target/k8s/statefulset.json b/instances/ee4j.interceptors/target/k8s/statefulset.json index 404760918..e5099f9da 100644 --- a/instances/ee4j.interceptors/target/k8s/statefulset.json +++ b/instances/ee4j.interceptors/target/k8s/statefulset.json @@ -119,6 +119,12 @@ "cpu": "250m" } }, + "securityContext": { + "seLinuxOptions": { + "level": "s0:c42,c9", + "type": "spc_t" + } + }, "volumeMounts": [ { "mountPath": "/var/jenkins", diff --git a/instances/ee4j.jaf/config.jsonnet b/instances/ee4j.jaf/config.jsonnet index dca78b9d8..9a133e2d7 100644 --- a/instances/ee4j.jaf/config.jsonnet +++ b/instances/ee4j.jaf/config.jsonnet @@ -9,4 +9,5 @@ "copyartifact", ], }, + seLinuxLevel: "s0:c42,c24", } diff --git a/instances/ee4j.jaf/target/config.json b/instances/ee4j.jaf/target/config.json index 20b228c53..938abc715 100644 --- a/instances/ee4j.jaf/target/config.json +++ b/instances/ee4j.jaf/target/config.json @@ -217,7 +217,7 @@ "docker.io/eclipsecbi/jiro-agent-centos-7:latest" ], "context": "centos-7", - "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-centos-7: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 [ \"uid_entrypoint\", \"/usr/local/bin/jenkins-agent\" ]\n\nADD \"https://repo.jenkins-ci.org/public/org/jenkins-ci/main/remoting/3206.3208.v409508a_675ff/remoting-3206.3208.v409508a_675ff.jar\" \"/usr/share/jenkins/agent.jar\" \nADD \"https://github.com/jenkinsci/docker-agent/raw/3206.vb_15dcf73f6a_9-12/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\nUSER 10001:0\n", + "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-centos-7: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/3206.3208.v409508a_675ff/remoting-3206.3208.v409508a_675ff.jar\" \"/usr/share/jenkins/agent.jar\"\nADD \"https://github.com/jenkinsci/docker-agent/raw/3206.vb_15dcf73f6a_9-12/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\nUSER 10001:0\n", "image": "jiro-agent-centos-7", "registry": "docker.io", "repository": "eclipsecbi", @@ -316,7 +316,7 @@ "docker.io/eclipsecbi/jiro-agent-centos-8:latest" ], "context": "centos-8", - "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-centos-8: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 [ \"uid_entrypoint\", \"/usr/local/bin/jenkins-agent\" ]\n\nADD \"https://repo.jenkins-ci.org/public/org/jenkins-ci/main/remoting/3206.3208.v409508a_675ff/remoting-3206.3208.v409508a_675ff.jar\" \"/usr/share/jenkins/agent.jar\" \nADD \"https://github.com/jenkinsci/docker-agent/raw/3206.vb_15dcf73f6a_9-12/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\nUSER 10001:0\n", + "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-centos-8: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/3206.3208.v409508a_675ff/remoting-3206.3208.v409508a_675ff.jar\" \"/usr/share/jenkins/agent.jar\"\nADD \"https://github.com/jenkinsci/docker-agent/raw/3206.vb_15dcf73f6a_9-12/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\nUSER 10001:0\n", "image": "jiro-agent-centos-8", "registry": "docker.io", "repository": "eclipsecbi", @@ -406,6 +406,203 @@ }, "startupScript": "/usr/local/bin/jenkins-agent", "username": "jenkins" + }, + "ubuntu-2204": { + "agentWorkdir": "/home/jenkins/jenkins-agent", + "docker": { + "aliases": [ + "docker.io/eclipsecbi/jiro-agent-ubuntu-2204:latest" + ], + "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-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/3206.3208.v409508a_675ff/remoting-3206.3208.v409508a_675ff.jar\" \"/usr/share/jenkins/agent.jar\"\nADD \"https://github.com/jenkinsci/docker-agent/raw/3206.vb_15dcf73f6a_9-12/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\nUSER 10001:0\n", + "image": "jiro-agent-ubuntu-2204", + "registry": "docker.io", + "repository": "eclipsecbi", + "tag": "remoting-3206.3208.v409508a_675ff" + }, + "env": { + "JAVA_TOOL_OPTIONS": [ ], + "JENKINS_REMOTING_JAVA_OPTS": [ + "-showversion", + "-XshowSettings:vm", + "-Xmx256m", + "-Dorg.jenkinsci.remoting.engine.JnlpProtocol3.disabled=true", + "-Dorg.jenkinsci.plugins.gitclient.CliGitAPIImpl.useSETSID=true" + ], + "OPENJ9_JAVA_OPTIONS": [ + "-XX:+IgnoreUnrecognizedVMOptions", + "-XX:+IdleTuningCompactOnIdle", + "-XX:+IdleTuningGcOnIdle" + ], + "_JAVA_OPTIONS": [ ] + }, + "home": "/home/jenkins", + "kubernetes": { + "inheritYamlMergeStrategy": true, + "resources": { + "cpu": { + "limit": "2000m", + "request": "1000m" + }, + "memory": { + "limit": "4096Mi", + "request": "4096Mi" + } + }, + "volumes": [ + { + "mounts": [ + { + "mountPath": "/home/jenkins/.m2/settings-security.xml", + "subPath": "settings-security.xml" + }, + { + "mountPath": "/home/jenkins/.m2/settings.xml", + "subPath": "settings.xml" + } + ], + "name": "m2-secret-dir", + "secret": { + "name": "m2-secret-dir" + } + }, + { + "configMap": { + "name": "m2-dir" + }, + "mounts": [ + { + "mountPath": "/home/jenkins/.m2/toolchains.xml", + "subPath": "toolchains.xml" + }, + { + "mountPath": "/home/jenkins/.mavenrc", + "subPath": ".mavenrc" + } + ], + "name": "m2-dir" + } + ], + "yamlMergeStrategy": "merge" + }, + "labels": [ + "ubuntu-2204" + ], + "maxHeap": "256m", + "mode": "EXCLUSIVE", + "name": "ubuntu-2204", + "remoting": { + "jar": "/usr/share/jenkins/agent.jar", + "startupScript": { + "name": "jenkins-agent", + "url": "https://github.com/jenkinsci/docker-agent/raw/3206.vb_15dcf73f6a_9-12/jenkins-agent", + "version": "3206.vb_15dcf73f6a_9-12" + }, + "url": "https://repo.jenkins-ci.org/public/org/jenkins-ci/main/remoting/3206.3208.v409508a_675ff/remoting-3206.3208.v409508a_675ff.jar", + "version": "3206.3208.v409508a_675ff" + }, + "startupScript": "/usr/local/bin/jenkins-agent", + "username": "jenkins" + }, + "ubuntu-2404": { + "agentWorkdir": "/home/jenkins/jenkins-agent", + "docker": { + "aliases": [ + "docker.io/eclipsecbi/jiro-agent-ubuntu-2404:latest" + ], + "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-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/3206.3208.v409508a_675ff/remoting-3206.3208.v409508a_675ff.jar\" \"/usr/share/jenkins/agent.jar\"\nADD \"https://github.com/jenkinsci/docker-agent/raw/3206.vb_15dcf73f6a_9-12/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\nUSER 10001:0\n", + "image": "jiro-agent-ubuntu-2404", + "registry": "docker.io", + "repository": "eclipsecbi", + "tag": "remoting-3206.3208.v409508a_675ff" + }, + "env": { + "JAVA_TOOL_OPTIONS": [ ], + "JENKINS_REMOTING_JAVA_OPTS": [ + "-showversion", + "-XshowSettings:vm", + "-Xmx256m", + "-Dorg.jenkinsci.remoting.engine.JnlpProtocol3.disabled=true", + "-Dorg.jenkinsci.plugins.gitclient.CliGitAPIImpl.useSETSID=true" + ], + "OPENJ9_JAVA_OPTIONS": [ + "-XX:+IgnoreUnrecognizedVMOptions", + "-XX:+IdleTuningCompactOnIdle", + "-XX:+IdleTuningGcOnIdle" + ], + "_JAVA_OPTIONS": [ ] + }, + "home": "/home/jenkins", + "kubernetes": { + "inheritYamlMergeStrategy": true, + "resources": { + "cpu": { + "limit": "2000m", + "request": "1000m" + }, + "memory": { + "limit": "4096Mi", + "request": "4096Mi" + } + }, + "volumes": [ + { + "mounts": [ + { + "mountPath": "/home/jenkins/.m2/settings-security.xml", + "subPath": "settings-security.xml" + }, + { + "mountPath": "/home/jenkins/.m2/settings.xml", + "subPath": "settings.xml" + } + ], + "name": "m2-secret-dir", + "secret": { + "name": "m2-secret-dir" + } + }, + { + "configMap": { + "name": "m2-dir" + }, + "mounts": [ + { + "mountPath": "/home/jenkins/.m2/toolchains.xml", + "subPath": "toolchains.xml" + }, + { + "mountPath": "/home/jenkins/.mavenrc", + "subPath": ".mavenrc" + } + ], + "name": "m2-dir" + } + ], + "yamlMergeStrategy": "merge" + }, + "labels": [ + "ubuntu-latest", + "ubuntu-2404" + ], + "maxHeap": "256m", + "mode": "EXCLUSIVE", + "name": "ubuntu-2404", + "remoting": { + "jar": "/usr/share/jenkins/agent.jar", + "startupScript": { + "name": "jenkins-agent", + "url": "https://github.com/jenkinsci/docker-agent/raw/3206.vb_15dcf73f6a_9-12/jenkins-agent", + "version": "3206.vb_15dcf73f6a_9-12" + }, + "url": "https://repo.jenkins-ci.org/public/org/jenkins-ci/main/remoting/3206.3208.v409508a_675ff/remoting-3206.3208.v409508a_675ff.jar", + "version": "3206.3208.v409508a_675ff" + }, + "startupScript": "/usr/local/bin/jenkins-agent", + "username": "jenkins" } } } @@ -754,6 +951,7 @@ }, "generate": false }, + "seLinuxLevel": "s0:c42,c24", "secrets": { "dockerconfigjson": { "dockerconfigjson-for-pull-as-default": { diff --git a/instances/ee4j.jaf/target/jenkins/configuration.yml b/instances/ee4j.jaf/target/jenkins/configuration.yml index 4596deb3e..e3307712c 100644 --- a/instances/ee4j.jaf/target/jenkins/configuration.yml +++ b/instances/ee4j.jaf/target/jenkins/configuration.yml @@ -485,6 +485,188 @@ jenkins: name: m2-dir inheritYamlMergeStrategy: "true" yamlMergeStrategy: "merge" + - name: "ubuntu-2204" + namespace: "jaf" + label: "ubuntu-2204" + containers: + - name: "jnlp" + image: docker.io/eclipsecbi/jiro-agent-ubuntu-2204:remoting-3206.3208.v409508a_675ff + alwaysPullImage: true + livenessProbe: + failureThreshold: 0 + initialDelaySeconds: 0 + periodSeconds: 0 + successThreshold: 0 + timeoutSeconds: 0 + ttyEnabled: true + command: "" + args: "" + instanceCap: -1 + nodeUsageMode: EXCLUSIVE + envVars: + - envVar: + key: "JAVA_TOOL_OPTIONS" + 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" + - envVar: + key: "OPENJ9_JAVA_OPTIONS" + value: "-XX:+IgnoreUnrecognizedVMOptions -XX:+IdleTuningCompactOnIdle -XX:+IdleTuningGcOnIdle" + - envVar: + key: "_JAVA_OPTIONS" + value: "" + volumes: + - persistentVolumeClaim: + claimName: "tools-claim-jiro-jaf" + mountPath: "/opt/tools" + readOnly: true + - configMapVolume: + configMapName: "known-hosts" + mountPath: "/home/jenkins/.ssh/" + subPath: "." + - emptyDirVolume: + memory: false + mountPath: "/home/jenkins/" + - emptyDirVolume: + memory: false + mountPath: "/home/jenkins/.m2/repository" + - emptyDirVolume: + memory: false + mountPath: "/home/jenkins/.m2/wrapper" + workspaceVolume: + emptyDirWorkspaceVolume: + memory: false + yaml: | + apiVersion: v1 + kind: Pod + spec: + containers: + - name: jnlp + resources: + limits: + cpu: "2000m" + memory: "4096Mi" + requests: + cpu: "1000m" + memory: "4096Mi" + volumeMounts: + - name: m2-secret-dir + mountPath: /home/jenkins/.m2/settings-security.xml + subPath: settings-security.xml + readOnly: true + - name: m2-secret-dir + mountPath: /home/jenkins/.m2/settings.xml + subPath: settings.xml + readOnly: true + - name: m2-dir + mountPath: /home/jenkins/.m2/toolchains.xml + subPath: toolchains.xml + readOnly: true + - name: m2-dir + mountPath: /home/jenkins/.mavenrc + subPath: .mavenrc + readOnly: true + volumes: + - name: m2-secret-dir + secret: + secretName: m2-secret-dir + - name: m2-dir + configMap: + name: m2-dir + inheritYamlMergeStrategy: "true" + yamlMergeStrategy: "merge" + - name: "ubuntu-2404" + namespace: "jaf" + label: "ubuntu-latest ubuntu-2404" + containers: + - name: "jnlp" + image: docker.io/eclipsecbi/jiro-agent-ubuntu-2404:remoting-3206.3208.v409508a_675ff + alwaysPullImage: true + livenessProbe: + failureThreshold: 0 + initialDelaySeconds: 0 + periodSeconds: 0 + successThreshold: 0 + timeoutSeconds: 0 + ttyEnabled: true + command: "" + args: "" + instanceCap: -1 + nodeUsageMode: EXCLUSIVE + envVars: + - envVar: + key: "JAVA_TOOL_OPTIONS" + 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" + - envVar: + key: "OPENJ9_JAVA_OPTIONS" + value: "-XX:+IgnoreUnrecognizedVMOptions -XX:+IdleTuningCompactOnIdle -XX:+IdleTuningGcOnIdle" + - envVar: + key: "_JAVA_OPTIONS" + value: "" + volumes: + - persistentVolumeClaim: + claimName: "tools-claim-jiro-jaf" + mountPath: "/opt/tools" + readOnly: true + - configMapVolume: + configMapName: "known-hosts" + mountPath: "/home/jenkins/.ssh/" + subPath: "." + - emptyDirVolume: + memory: false + mountPath: "/home/jenkins/" + - emptyDirVolume: + memory: false + mountPath: "/home/jenkins/.m2/repository" + - emptyDirVolume: + memory: false + mountPath: "/home/jenkins/.m2/wrapper" + workspaceVolume: + emptyDirWorkspaceVolume: + memory: false + yaml: | + apiVersion: v1 + kind: Pod + spec: + containers: + - name: jnlp + resources: + limits: + cpu: "2000m" + memory: "4096Mi" + requests: + cpu: "1000m" + memory: "4096Mi" + volumeMounts: + - name: m2-secret-dir + mountPath: /home/jenkins/.m2/settings-security.xml + subPath: settings-security.xml + readOnly: true + - name: m2-secret-dir + mountPath: /home/jenkins/.m2/settings.xml + subPath: settings.xml + readOnly: true + - name: m2-dir + mountPath: /home/jenkins/.m2/toolchains.xml + subPath: toolchains.xml + readOnly: true + - name: m2-dir + mountPath: /home/jenkins/.mavenrc + subPath: .mavenrc + readOnly: true + volumes: + - name: m2-secret-dir + secret: + secretName: m2-secret-dir + - name: m2-dir + configMap: + name: m2-dir + inheritYamlMergeStrategy: "true" + yamlMergeStrategy: "merge" security: apiToken: creationOfLegacyTokenEnabled: false @@ -579,6 +761,8 @@ tool: home: "/opt/tools/java/openjdk/latest" - name: "openjdk-ea-latest" home: "/opt/tools/java/openjdk/ea-latest" + - name: "openjdk-jdk24-latest" + home: "/opt/tools/java/openjdk/jdk-24/latest" - name: "openjdk-jdk23-latest" home: "/opt/tools/java/openjdk/jdk-23/latest" - name: "openjdk-jdk22-latest" @@ -708,6 +892,8 @@ tool: installations: - name: "apache-maven-latest" home: "/opt/tools/apache-maven/latest" + - name: "apache-maven-3.9.9" + home: "/opt/tools/apache-maven/3.9.9" - name: "apache-maven-3.9.6" home: "/opt/tools/apache-maven/3.9.6" - name: "apache-maven-3.9.5" diff --git a/instances/ee4j.jaf/target/k8s/configmap-jenkins-config.yml b/instances/ee4j.jaf/target/k8s/configmap-jenkins-config.yml index 3a2b50874..8055fbf09 100644 --- a/instances/ee4j.jaf/target/k8s/configmap-jenkins-config.yml +++ b/instances/ee4j.jaf/target/k8s/configmap-jenkins-config.yml @@ -508,6 +508,188 @@ data: name: m2-dir inheritYamlMergeStrategy: "true" yamlMergeStrategy: "merge" + - name: "ubuntu-2204" + namespace: "jaf" + label: "ubuntu-2204" + containers: + - name: "jnlp" + image: docker.io/eclipsecbi/jiro-agent-ubuntu-2204:remoting-3206.3208.v409508a_675ff + alwaysPullImage: true + livenessProbe: + failureThreshold: 0 + initialDelaySeconds: 0 + periodSeconds: 0 + successThreshold: 0 + timeoutSeconds: 0 + ttyEnabled: true + command: "" + args: "" + instanceCap: -1 + nodeUsageMode: EXCLUSIVE + envVars: + - envVar: + key: "JAVA_TOOL_OPTIONS" + 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" + - envVar: + key: "OPENJ9_JAVA_OPTIONS" + value: "-XX:+IgnoreUnrecognizedVMOptions -XX:+IdleTuningCompactOnIdle -XX:+IdleTuningGcOnIdle" + - envVar: + key: "_JAVA_OPTIONS" + value: "" + volumes: + - persistentVolumeClaim: + claimName: "tools-claim-jiro-jaf" + mountPath: "/opt/tools" + readOnly: true + - configMapVolume: + configMapName: "known-hosts" + mountPath: "/home/jenkins/.ssh/" + subPath: "." + - emptyDirVolume: + memory: false + mountPath: "/home/jenkins/" + - emptyDirVolume: + memory: false + mountPath: "/home/jenkins/.m2/repository" + - emptyDirVolume: + memory: false + mountPath: "/home/jenkins/.m2/wrapper" + workspaceVolume: + emptyDirWorkspaceVolume: + memory: false + yaml: | + apiVersion: v1 + kind: Pod + spec: + containers: + - name: jnlp + resources: + limits: + cpu: "2000m" + memory: "4096Mi" + requests: + cpu: "1000m" + memory: "4096Mi" + volumeMounts: + - name: m2-secret-dir + mountPath: /home/jenkins/.m2/settings-security.xml + subPath: settings-security.xml + readOnly: true + - name: m2-secret-dir + mountPath: /home/jenkins/.m2/settings.xml + subPath: settings.xml + readOnly: true + - name: m2-dir + mountPath: /home/jenkins/.m2/toolchains.xml + subPath: toolchains.xml + readOnly: true + - name: m2-dir + mountPath: /home/jenkins/.mavenrc + subPath: .mavenrc + readOnly: true + volumes: + - name: m2-secret-dir + secret: + secretName: m2-secret-dir + - name: m2-dir + configMap: + name: m2-dir + inheritYamlMergeStrategy: "true" + yamlMergeStrategy: "merge" + - name: "ubuntu-2404" + namespace: "jaf" + label: "ubuntu-latest ubuntu-2404" + containers: + - name: "jnlp" + image: docker.io/eclipsecbi/jiro-agent-ubuntu-2404:remoting-3206.3208.v409508a_675ff + alwaysPullImage: true + livenessProbe: + failureThreshold: 0 + initialDelaySeconds: 0 + periodSeconds: 0 + successThreshold: 0 + timeoutSeconds: 0 + ttyEnabled: true + command: "" + args: "" + instanceCap: -1 + nodeUsageMode: EXCLUSIVE + envVars: + - envVar: + key: "JAVA_TOOL_OPTIONS" + 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" + - envVar: + key: "OPENJ9_JAVA_OPTIONS" + value: "-XX:+IgnoreUnrecognizedVMOptions -XX:+IdleTuningCompactOnIdle -XX:+IdleTuningGcOnIdle" + - envVar: + key: "_JAVA_OPTIONS" + value: "" + volumes: + - persistentVolumeClaim: + claimName: "tools-claim-jiro-jaf" + mountPath: "/opt/tools" + readOnly: true + - configMapVolume: + configMapName: "known-hosts" + mountPath: "/home/jenkins/.ssh/" + subPath: "." + - emptyDirVolume: + memory: false + mountPath: "/home/jenkins/" + - emptyDirVolume: + memory: false + mountPath: "/home/jenkins/.m2/repository" + - emptyDirVolume: + memory: false + mountPath: "/home/jenkins/.m2/wrapper" + workspaceVolume: + emptyDirWorkspaceVolume: + memory: false + yaml: | + apiVersion: v1 + kind: Pod + spec: + containers: + - name: jnlp + resources: + limits: + cpu: "2000m" + memory: "4096Mi" + requests: + cpu: "1000m" + memory: "4096Mi" + volumeMounts: + - name: m2-secret-dir + mountPath: /home/jenkins/.m2/settings-security.xml + subPath: settings-security.xml + readOnly: true + - name: m2-secret-dir + mountPath: /home/jenkins/.m2/settings.xml + subPath: settings.xml + readOnly: true + - name: m2-dir + mountPath: /home/jenkins/.m2/toolchains.xml + subPath: toolchains.xml + readOnly: true + - name: m2-dir + mountPath: /home/jenkins/.mavenrc + subPath: .mavenrc + readOnly: true + volumes: + - name: m2-secret-dir + secret: + secretName: m2-secret-dir + - name: m2-dir + configMap: + name: m2-dir + inheritYamlMergeStrategy: "true" + yamlMergeStrategy: "merge" security: apiToken: creationOfLegacyTokenEnabled: false @@ -602,6 +784,8 @@ data: home: "/opt/tools/java/openjdk/latest" - name: "openjdk-ea-latest" home: "/opt/tools/java/openjdk/ea-latest" + - name: "openjdk-jdk24-latest" + home: "/opt/tools/java/openjdk/jdk-24/latest" - name: "openjdk-jdk23-latest" home: "/opt/tools/java/openjdk/jdk-23/latest" - name: "openjdk-jdk22-latest" @@ -731,6 +915,8 @@ data: installations: - name: "apache-maven-latest" home: "/opt/tools/apache-maven/latest" + - name: "apache-maven-3.9.9" + home: "/opt/tools/apache-maven/3.9.9" - name: "apache-maven-3.9.6" home: "/opt/tools/apache-maven/3.9.6" - name: "apache-maven-3.9.5" diff --git a/instances/ee4j.jaf/target/k8s/m2-dir.json b/instances/ee4j.jaf/target/k8s/m2-dir.json index 01c9c319d..1fcbc4660 100644 --- a/instances/ee4j.jaf/target/k8s/m2-dir.json +++ b/instances/ee4j.jaf/target/k8s/m2-dir.json @@ -2,7 +2,7 @@ "apiVersion": "v1", "data": { ".mavenrc": "set -- -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn --batch-mode \"${@}\"", - "toolchains.xml": "\n\n \n jdk\n \n JavaSE-1.8\n 1.8\n oracle\n \n /opt/tools/java/oracle/jdk-8/latest\n \n \n jdk\n \n JavaSE-9\n 9\n openjdk\n \n /opt/tools/java/openjdk/jdk-9/latest\n \n \n jdk\n \n JavaSE-10\n 10\n openjdk\n \n /opt/tools/java/openjdk/jdk-10/latest\n \n \n jdk\n \n JavaSE-11\n 11\n openjdk\n \n /opt/tools/java/openjdk/jdk-11/latest\n \n \n jdk\n \n JavaSE-12\n 12\n openjdk\n \n /opt/tools/java/openjdk/jdk-12/latest\n \n \n jdk\n \n JavaSE-13\n 13\n openjdk\n \n /opt/tools/java/openjdk/jdk-13/latest\n \n \n jdk\n \n JavaSE-14\n 14\n openjdk\n \n /opt/tools/java/openjdk/jdk-14/latest\n \n \n jdk\n \n JavaSE-15\n 15\n openjdk\n \n /opt/tools/java/openjdk/jdk-15/latest\n \n \n jdk\n \n JavaSE-16\n 16\n openjdk\n \n /opt/tools/java/openjdk/jdk-16/latest\n \n \n jdk\n \n JavaSE-17\n 17\n openjdk\n \n /opt/tools/java/openjdk/jdk-17/latest\n \n \n jdk\n \n JavaSE-18\n 18\n openjdk\n \n /opt/tools/java/openjdk/jdk-18/latest\n \n \n jdk\n \n JavaSE-19\n 19\n openjdk\n \n /opt/tools/java/openjdk/jdk-19/latest\n \n \n jdk\n \n JavaSE-20\n 20\n openjdk\n \n /opt/tools/java/openjdk/jdk-20/latest\n \n \n jdk\n \n JavaSE-21\n 21\n openjdk\n \n /opt/tools/java/openjdk/jdk-21/latest\n \n \n jdk\n \n JavaSE-22\n 22\n openjdk\n \n /opt/tools/java/openjdk/jdk-22/latest\n \n \n jdk\n \n JavaSE-23\n 23\n openjdk\n \n /opt/tools/java/openjdk/jdk-23/latest\n \n\n" + "toolchains.xml": "\n\n \n jdk\n \n JavaSE-1.8\n 1.8\n oracle\n \n /opt/tools/java/oracle/jdk-8/latest\n \n \n jdk\n \n JavaSE-9\n 9\n openjdk\n \n /opt/tools/java/openjdk/jdk-9/latest\n \n \n jdk\n \n JavaSE-10\n 10\n openjdk\n \n /opt/tools/java/openjdk/jdk-10/latest\n \n \n jdk\n \n JavaSE-11\n 11\n openjdk\n \n /opt/tools/java/openjdk/jdk-11/latest\n \n \n jdk\n \n JavaSE-12\n 12\n openjdk\n \n /opt/tools/java/openjdk/jdk-12/latest\n \n \n jdk\n \n JavaSE-13\n 13\n openjdk\n \n /opt/tools/java/openjdk/jdk-13/latest\n \n \n jdk\n \n JavaSE-14\n 14\n openjdk\n \n /opt/tools/java/openjdk/jdk-14/latest\n \n \n jdk\n \n JavaSE-15\n 15\n openjdk\n \n /opt/tools/java/openjdk/jdk-15/latest\n \n \n jdk\n \n JavaSE-16\n 16\n openjdk\n \n /opt/tools/java/openjdk/jdk-16/latest\n \n \n jdk\n \n JavaSE-17\n 17\n openjdk\n \n /opt/tools/java/openjdk/jdk-17/latest\n \n \n jdk\n \n JavaSE-18\n 18\n openjdk\n \n /opt/tools/java/openjdk/jdk-18/latest\n \n \n jdk\n \n JavaSE-19\n 19\n openjdk\n \n /opt/tools/java/openjdk/jdk-19/latest\n \n \n jdk\n \n JavaSE-20\n 20\n openjdk\n \n /opt/tools/java/openjdk/jdk-20/latest\n \n \n jdk\n \n JavaSE-21\n 21\n openjdk\n \n /opt/tools/java/openjdk/jdk-21/latest\n \n \n jdk\n \n JavaSE-22\n 22\n openjdk\n \n /opt/tools/java/openjdk/jdk-22/latest\n \n \n jdk\n \n JavaSE-23\n 23\n openjdk\n \n /opt/tools/java/openjdk/jdk-23/latest\n \n \n jdk\n \n JavaSE-24\n 24\n openjdk\n \n /opt/tools/java/openjdk/jdk-24/latest\n \n\n" }, "kind": "ConfigMap", "metadata": { diff --git a/instances/ee4j.jaf/target/k8s/statefulset.json b/instances/ee4j.jaf/target/k8s/statefulset.json index 2e576b1b7..3042b05f5 100644 --- a/instances/ee4j.jaf/target/k8s/statefulset.json +++ b/instances/ee4j.jaf/target/k8s/statefulset.json @@ -119,6 +119,12 @@ "cpu": "250m" } }, + "securityContext": { + "seLinuxOptions": { + "level": "s0:c42,c24", + "type": "spc_t" + } + }, "volumeMounts": [ { "mountPath": "/var/jenkins", diff --git a/instances/ee4j.jakartaconfig/config.jsonnet b/instances/ee4j.jakartaconfig/config.jsonnet index 7fb286bf9..75ff99f94 100644 --- a/instances/ee4j.jakartaconfig/config.jsonnet +++ b/instances/ee4j.jakartaconfig/config.jsonnet @@ -8,4 +8,5 @@ "copyartifact", ], }, + seLinuxLevel: "s0:c56,c35", } diff --git a/instances/ee4j.jakartaconfig/target/config.json b/instances/ee4j.jakartaconfig/target/config.json index c0dff02c9..73fcbd2e3 100644 --- a/instances/ee4j.jakartaconfig/target/config.json +++ b/instances/ee4j.jakartaconfig/target/config.json @@ -217,7 +217,7 @@ "docker.io/eclipsecbi/jiro-agent-centos-7:latest" ], "context": "centos-7", - "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-centos-7: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 [ \"uid_entrypoint\", \"/usr/local/bin/jenkins-agent\" ]\n\nADD \"https://repo.jenkins-ci.org/public/org/jenkins-ci/main/remoting/3206.3208.v409508a_675ff/remoting-3206.3208.v409508a_675ff.jar\" \"/usr/share/jenkins/agent.jar\" \nADD \"https://github.com/jenkinsci/docker-agent/raw/3206.vb_15dcf73f6a_9-12/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\nUSER 10001:0\n", + "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-centos-7: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/3206.3208.v409508a_675ff/remoting-3206.3208.v409508a_675ff.jar\" \"/usr/share/jenkins/agent.jar\"\nADD \"https://github.com/jenkinsci/docker-agent/raw/3206.vb_15dcf73f6a_9-12/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\nUSER 10001:0\n", "image": "jiro-agent-centos-7", "registry": "docker.io", "repository": "eclipsecbi", @@ -316,7 +316,7 @@ "docker.io/eclipsecbi/jiro-agent-centos-8:latest" ], "context": "centos-8", - "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-centos-8: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 [ \"uid_entrypoint\", \"/usr/local/bin/jenkins-agent\" ]\n\nADD \"https://repo.jenkins-ci.org/public/org/jenkins-ci/main/remoting/3206.3208.v409508a_675ff/remoting-3206.3208.v409508a_675ff.jar\" \"/usr/share/jenkins/agent.jar\" \nADD \"https://github.com/jenkinsci/docker-agent/raw/3206.vb_15dcf73f6a_9-12/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\nUSER 10001:0\n", + "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-centos-8: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/3206.3208.v409508a_675ff/remoting-3206.3208.v409508a_675ff.jar\" \"/usr/share/jenkins/agent.jar\"\nADD \"https://github.com/jenkinsci/docker-agent/raw/3206.vb_15dcf73f6a_9-12/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\nUSER 10001:0\n", "image": "jiro-agent-centos-8", "registry": "docker.io", "repository": "eclipsecbi", @@ -406,6 +406,203 @@ }, "startupScript": "/usr/local/bin/jenkins-agent", "username": "jenkins" + }, + "ubuntu-2204": { + "agentWorkdir": "/home/jenkins/jenkins-agent", + "docker": { + "aliases": [ + "docker.io/eclipsecbi/jiro-agent-ubuntu-2204:latest" + ], + "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-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/3206.3208.v409508a_675ff/remoting-3206.3208.v409508a_675ff.jar\" \"/usr/share/jenkins/agent.jar\"\nADD \"https://github.com/jenkinsci/docker-agent/raw/3206.vb_15dcf73f6a_9-12/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\nUSER 10001:0\n", + "image": "jiro-agent-ubuntu-2204", + "registry": "docker.io", + "repository": "eclipsecbi", + "tag": "remoting-3206.3208.v409508a_675ff" + }, + "env": { + "JAVA_TOOL_OPTIONS": [ ], + "JENKINS_REMOTING_JAVA_OPTS": [ + "-showversion", + "-XshowSettings:vm", + "-Xmx256m", + "-Dorg.jenkinsci.remoting.engine.JnlpProtocol3.disabled=true", + "-Dorg.jenkinsci.plugins.gitclient.CliGitAPIImpl.useSETSID=true" + ], + "OPENJ9_JAVA_OPTIONS": [ + "-XX:+IgnoreUnrecognizedVMOptions", + "-XX:+IdleTuningCompactOnIdle", + "-XX:+IdleTuningGcOnIdle" + ], + "_JAVA_OPTIONS": [ ] + }, + "home": "/home/jenkins", + "kubernetes": { + "inheritYamlMergeStrategy": true, + "resources": { + "cpu": { + "limit": "2000m", + "request": "1000m" + }, + "memory": { + "limit": "4096Mi", + "request": "4096Mi" + } + }, + "volumes": [ + { + "mounts": [ + { + "mountPath": "/home/jenkins/.m2/settings-security.xml", + "subPath": "settings-security.xml" + }, + { + "mountPath": "/home/jenkins/.m2/settings.xml", + "subPath": "settings.xml" + } + ], + "name": "m2-secret-dir", + "secret": { + "name": "m2-secret-dir" + } + }, + { + "configMap": { + "name": "m2-dir" + }, + "mounts": [ + { + "mountPath": "/home/jenkins/.m2/toolchains.xml", + "subPath": "toolchains.xml" + }, + { + "mountPath": "/home/jenkins/.mavenrc", + "subPath": ".mavenrc" + } + ], + "name": "m2-dir" + } + ], + "yamlMergeStrategy": "merge" + }, + "labels": [ + "ubuntu-2204" + ], + "maxHeap": "256m", + "mode": "EXCLUSIVE", + "name": "ubuntu-2204", + "remoting": { + "jar": "/usr/share/jenkins/agent.jar", + "startupScript": { + "name": "jenkins-agent", + "url": "https://github.com/jenkinsci/docker-agent/raw/3206.vb_15dcf73f6a_9-12/jenkins-agent", + "version": "3206.vb_15dcf73f6a_9-12" + }, + "url": "https://repo.jenkins-ci.org/public/org/jenkins-ci/main/remoting/3206.3208.v409508a_675ff/remoting-3206.3208.v409508a_675ff.jar", + "version": "3206.3208.v409508a_675ff" + }, + "startupScript": "/usr/local/bin/jenkins-agent", + "username": "jenkins" + }, + "ubuntu-2404": { + "agentWorkdir": "/home/jenkins/jenkins-agent", + "docker": { + "aliases": [ + "docker.io/eclipsecbi/jiro-agent-ubuntu-2404:latest" + ], + "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-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/3206.3208.v409508a_675ff/remoting-3206.3208.v409508a_675ff.jar\" \"/usr/share/jenkins/agent.jar\"\nADD \"https://github.com/jenkinsci/docker-agent/raw/3206.vb_15dcf73f6a_9-12/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\nUSER 10001:0\n", + "image": "jiro-agent-ubuntu-2404", + "registry": "docker.io", + "repository": "eclipsecbi", + "tag": "remoting-3206.3208.v409508a_675ff" + }, + "env": { + "JAVA_TOOL_OPTIONS": [ ], + "JENKINS_REMOTING_JAVA_OPTS": [ + "-showversion", + "-XshowSettings:vm", + "-Xmx256m", + "-Dorg.jenkinsci.remoting.engine.JnlpProtocol3.disabled=true", + "-Dorg.jenkinsci.plugins.gitclient.CliGitAPIImpl.useSETSID=true" + ], + "OPENJ9_JAVA_OPTIONS": [ + "-XX:+IgnoreUnrecognizedVMOptions", + "-XX:+IdleTuningCompactOnIdle", + "-XX:+IdleTuningGcOnIdle" + ], + "_JAVA_OPTIONS": [ ] + }, + "home": "/home/jenkins", + "kubernetes": { + "inheritYamlMergeStrategy": true, + "resources": { + "cpu": { + "limit": "2000m", + "request": "1000m" + }, + "memory": { + "limit": "4096Mi", + "request": "4096Mi" + } + }, + "volumes": [ + { + "mounts": [ + { + "mountPath": "/home/jenkins/.m2/settings-security.xml", + "subPath": "settings-security.xml" + }, + { + "mountPath": "/home/jenkins/.m2/settings.xml", + "subPath": "settings.xml" + } + ], + "name": "m2-secret-dir", + "secret": { + "name": "m2-secret-dir" + } + }, + { + "configMap": { + "name": "m2-dir" + }, + "mounts": [ + { + "mountPath": "/home/jenkins/.m2/toolchains.xml", + "subPath": "toolchains.xml" + }, + { + "mountPath": "/home/jenkins/.mavenrc", + "subPath": ".mavenrc" + } + ], + "name": "m2-dir" + } + ], + "yamlMergeStrategy": "merge" + }, + "labels": [ + "ubuntu-latest", + "ubuntu-2404" + ], + "maxHeap": "256m", + "mode": "EXCLUSIVE", + "name": "ubuntu-2404", + "remoting": { + "jar": "/usr/share/jenkins/agent.jar", + "startupScript": { + "name": "jenkins-agent", + "url": "https://github.com/jenkinsci/docker-agent/raw/3206.vb_15dcf73f6a_9-12/jenkins-agent", + "version": "3206.vb_15dcf73f6a_9-12" + }, + "url": "https://repo.jenkins-ci.org/public/org/jenkins-ci/main/remoting/3206.3208.v409508a_675ff/remoting-3206.3208.v409508a_675ff.jar", + "version": "3206.3208.v409508a_675ff" + }, + "startupScript": "/usr/local/bin/jenkins-agent", + "username": "jenkins" } } } @@ -754,6 +951,7 @@ }, "generate": false }, + "seLinuxLevel": "s0:c56,c35", "secrets": { "dockerconfigjson": { "dockerconfigjson-for-pull-as-default": { diff --git a/instances/ee4j.jakartaconfig/target/jenkins/configuration.yml b/instances/ee4j.jakartaconfig/target/jenkins/configuration.yml index 03d81db03..efbd87afa 100644 --- a/instances/ee4j.jakartaconfig/target/jenkins/configuration.yml +++ b/instances/ee4j.jakartaconfig/target/jenkins/configuration.yml @@ -485,6 +485,188 @@ jenkins: name: m2-dir inheritYamlMergeStrategy: "true" yamlMergeStrategy: "merge" + - name: "ubuntu-2204" + namespace: "jakartaconfig" + label: "ubuntu-2204" + containers: + - name: "jnlp" + image: docker.io/eclipsecbi/jiro-agent-ubuntu-2204:remoting-3206.3208.v409508a_675ff + alwaysPullImage: true + livenessProbe: + failureThreshold: 0 + initialDelaySeconds: 0 + periodSeconds: 0 + successThreshold: 0 + timeoutSeconds: 0 + ttyEnabled: true + command: "" + args: "" + instanceCap: -1 + nodeUsageMode: EXCLUSIVE + envVars: + - envVar: + key: "JAVA_TOOL_OPTIONS" + 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" + - envVar: + key: "OPENJ9_JAVA_OPTIONS" + value: "-XX:+IgnoreUnrecognizedVMOptions -XX:+IdleTuningCompactOnIdle -XX:+IdleTuningGcOnIdle" + - envVar: + key: "_JAVA_OPTIONS" + value: "" + volumes: + - persistentVolumeClaim: + claimName: "tools-claim-jiro-jakartaconfig" + mountPath: "/opt/tools" + readOnly: true + - configMapVolume: + configMapName: "known-hosts" + mountPath: "/home/jenkins/.ssh/" + subPath: "." + - emptyDirVolume: + memory: false + mountPath: "/home/jenkins/" + - emptyDirVolume: + memory: false + mountPath: "/home/jenkins/.m2/repository" + - emptyDirVolume: + memory: false + mountPath: "/home/jenkins/.m2/wrapper" + workspaceVolume: + emptyDirWorkspaceVolume: + memory: false + yaml: | + apiVersion: v1 + kind: Pod + spec: + containers: + - name: jnlp + resources: + limits: + cpu: "2000m" + memory: "4096Mi" + requests: + cpu: "1000m" + memory: "4096Mi" + volumeMounts: + - name: m2-secret-dir + mountPath: /home/jenkins/.m2/settings-security.xml + subPath: settings-security.xml + readOnly: true + - name: m2-secret-dir + mountPath: /home/jenkins/.m2/settings.xml + subPath: settings.xml + readOnly: true + - name: m2-dir + mountPath: /home/jenkins/.m2/toolchains.xml + subPath: toolchains.xml + readOnly: true + - name: m2-dir + mountPath: /home/jenkins/.mavenrc + subPath: .mavenrc + readOnly: true + volumes: + - name: m2-secret-dir + secret: + secretName: m2-secret-dir + - name: m2-dir + configMap: + name: m2-dir + inheritYamlMergeStrategy: "true" + yamlMergeStrategy: "merge" + - name: "ubuntu-2404" + namespace: "jakartaconfig" + label: "ubuntu-latest ubuntu-2404" + containers: + - name: "jnlp" + image: docker.io/eclipsecbi/jiro-agent-ubuntu-2404:remoting-3206.3208.v409508a_675ff + alwaysPullImage: true + livenessProbe: + failureThreshold: 0 + initialDelaySeconds: 0 + periodSeconds: 0 + successThreshold: 0 + timeoutSeconds: 0 + ttyEnabled: true + command: "" + args: "" + instanceCap: -1 + nodeUsageMode: EXCLUSIVE + envVars: + - envVar: + key: "JAVA_TOOL_OPTIONS" + 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" + - envVar: + key: "OPENJ9_JAVA_OPTIONS" + value: "-XX:+IgnoreUnrecognizedVMOptions -XX:+IdleTuningCompactOnIdle -XX:+IdleTuningGcOnIdle" + - envVar: + key: "_JAVA_OPTIONS" + value: "" + volumes: + - persistentVolumeClaim: + claimName: "tools-claim-jiro-jakartaconfig" + mountPath: "/opt/tools" + readOnly: true + - configMapVolume: + configMapName: "known-hosts" + mountPath: "/home/jenkins/.ssh/" + subPath: "." + - emptyDirVolume: + memory: false + mountPath: "/home/jenkins/" + - emptyDirVolume: + memory: false + mountPath: "/home/jenkins/.m2/repository" + - emptyDirVolume: + memory: false + mountPath: "/home/jenkins/.m2/wrapper" + workspaceVolume: + emptyDirWorkspaceVolume: + memory: false + yaml: | + apiVersion: v1 + kind: Pod + spec: + containers: + - name: jnlp + resources: + limits: + cpu: "2000m" + memory: "4096Mi" + requests: + cpu: "1000m" + memory: "4096Mi" + volumeMounts: + - name: m2-secret-dir + mountPath: /home/jenkins/.m2/settings-security.xml + subPath: settings-security.xml + readOnly: true + - name: m2-secret-dir + mountPath: /home/jenkins/.m2/settings.xml + subPath: settings.xml + readOnly: true + - name: m2-dir + mountPath: /home/jenkins/.m2/toolchains.xml + subPath: toolchains.xml + readOnly: true + - name: m2-dir + mountPath: /home/jenkins/.mavenrc + subPath: .mavenrc + readOnly: true + volumes: + - name: m2-secret-dir + secret: + secretName: m2-secret-dir + - name: m2-dir + configMap: + name: m2-dir + inheritYamlMergeStrategy: "true" + yamlMergeStrategy: "merge" security: apiToken: creationOfLegacyTokenEnabled: false @@ -579,6 +761,8 @@ tool: home: "/opt/tools/java/openjdk/latest" - name: "openjdk-ea-latest" home: "/opt/tools/java/openjdk/ea-latest" + - name: "openjdk-jdk24-latest" + home: "/opt/tools/java/openjdk/jdk-24/latest" - name: "openjdk-jdk23-latest" home: "/opt/tools/java/openjdk/jdk-23/latest" - name: "openjdk-jdk22-latest" @@ -708,6 +892,8 @@ tool: installations: - name: "apache-maven-latest" home: "/opt/tools/apache-maven/latest" + - name: "apache-maven-3.9.9" + home: "/opt/tools/apache-maven/3.9.9" - name: "apache-maven-3.9.6" home: "/opt/tools/apache-maven/3.9.6" - name: "apache-maven-3.9.5" diff --git a/instances/ee4j.jakartaconfig/target/k8s/configmap-jenkins-config.yml b/instances/ee4j.jakartaconfig/target/k8s/configmap-jenkins-config.yml index 4f34f3d29..a8f52877d 100644 --- a/instances/ee4j.jakartaconfig/target/k8s/configmap-jenkins-config.yml +++ b/instances/ee4j.jakartaconfig/target/k8s/configmap-jenkins-config.yml @@ -508,6 +508,188 @@ data: name: m2-dir inheritYamlMergeStrategy: "true" yamlMergeStrategy: "merge" + - name: "ubuntu-2204" + namespace: "jakartaconfig" + label: "ubuntu-2204" + containers: + - name: "jnlp" + image: docker.io/eclipsecbi/jiro-agent-ubuntu-2204:remoting-3206.3208.v409508a_675ff + alwaysPullImage: true + livenessProbe: + failureThreshold: 0 + initialDelaySeconds: 0 + periodSeconds: 0 + successThreshold: 0 + timeoutSeconds: 0 + ttyEnabled: true + command: "" + args: "" + instanceCap: -1 + nodeUsageMode: EXCLUSIVE + envVars: + - envVar: + key: "JAVA_TOOL_OPTIONS" + 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" + - envVar: + key: "OPENJ9_JAVA_OPTIONS" + value: "-XX:+IgnoreUnrecognizedVMOptions -XX:+IdleTuningCompactOnIdle -XX:+IdleTuningGcOnIdle" + - envVar: + key: "_JAVA_OPTIONS" + value: "" + volumes: + - persistentVolumeClaim: + claimName: "tools-claim-jiro-jakartaconfig" + mountPath: "/opt/tools" + readOnly: true + - configMapVolume: + configMapName: "known-hosts" + mountPath: "/home/jenkins/.ssh/" + subPath: "." + - emptyDirVolume: + memory: false + mountPath: "/home/jenkins/" + - emptyDirVolume: + memory: false + mountPath: "/home/jenkins/.m2/repository" + - emptyDirVolume: + memory: false + mountPath: "/home/jenkins/.m2/wrapper" + workspaceVolume: + emptyDirWorkspaceVolume: + memory: false + yaml: | + apiVersion: v1 + kind: Pod + spec: + containers: + - name: jnlp + resources: + limits: + cpu: "2000m" + memory: "4096Mi" + requests: + cpu: "1000m" + memory: "4096Mi" + volumeMounts: + - name: m2-secret-dir + mountPath: /home/jenkins/.m2/settings-security.xml + subPath: settings-security.xml + readOnly: true + - name: m2-secret-dir + mountPath: /home/jenkins/.m2/settings.xml + subPath: settings.xml + readOnly: true + - name: m2-dir + mountPath: /home/jenkins/.m2/toolchains.xml + subPath: toolchains.xml + readOnly: true + - name: m2-dir + mountPath: /home/jenkins/.mavenrc + subPath: .mavenrc + readOnly: true + volumes: + - name: m2-secret-dir + secret: + secretName: m2-secret-dir + - name: m2-dir + configMap: + name: m2-dir + inheritYamlMergeStrategy: "true" + yamlMergeStrategy: "merge" + - name: "ubuntu-2404" + namespace: "jakartaconfig" + label: "ubuntu-latest ubuntu-2404" + containers: + - name: "jnlp" + image: docker.io/eclipsecbi/jiro-agent-ubuntu-2404:remoting-3206.3208.v409508a_675ff + alwaysPullImage: true + livenessProbe: + failureThreshold: 0 + initialDelaySeconds: 0 + periodSeconds: 0 + successThreshold: 0 + timeoutSeconds: 0 + ttyEnabled: true + command: "" + args: "" + instanceCap: -1 + nodeUsageMode: EXCLUSIVE + envVars: + - envVar: + key: "JAVA_TOOL_OPTIONS" + 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" + - envVar: + key: "OPENJ9_JAVA_OPTIONS" + value: "-XX:+IgnoreUnrecognizedVMOptions -XX:+IdleTuningCompactOnIdle -XX:+IdleTuningGcOnIdle" + - envVar: + key: "_JAVA_OPTIONS" + value: "" + volumes: + - persistentVolumeClaim: + claimName: "tools-claim-jiro-jakartaconfig" + mountPath: "/opt/tools" + readOnly: true + - configMapVolume: + configMapName: "known-hosts" + mountPath: "/home/jenkins/.ssh/" + subPath: "." + - emptyDirVolume: + memory: false + mountPath: "/home/jenkins/" + - emptyDirVolume: + memory: false + mountPath: "/home/jenkins/.m2/repository" + - emptyDirVolume: + memory: false + mountPath: "/home/jenkins/.m2/wrapper" + workspaceVolume: + emptyDirWorkspaceVolume: + memory: false + yaml: | + apiVersion: v1 + kind: Pod + spec: + containers: + - name: jnlp + resources: + limits: + cpu: "2000m" + memory: "4096Mi" + requests: + cpu: "1000m" + memory: "4096Mi" + volumeMounts: + - name: m2-secret-dir + mountPath: /home/jenkins/.m2/settings-security.xml + subPath: settings-security.xml + readOnly: true + - name: m2-secret-dir + mountPath: /home/jenkins/.m2/settings.xml + subPath: settings.xml + readOnly: true + - name: m2-dir + mountPath: /home/jenkins/.m2/toolchains.xml + subPath: toolchains.xml + readOnly: true + - name: m2-dir + mountPath: /home/jenkins/.mavenrc + subPath: .mavenrc + readOnly: true + volumes: + - name: m2-secret-dir + secret: + secretName: m2-secret-dir + - name: m2-dir + configMap: + name: m2-dir + inheritYamlMergeStrategy: "true" + yamlMergeStrategy: "merge" security: apiToken: creationOfLegacyTokenEnabled: false @@ -602,6 +784,8 @@ data: home: "/opt/tools/java/openjdk/latest" - name: "openjdk-ea-latest" home: "/opt/tools/java/openjdk/ea-latest" + - name: "openjdk-jdk24-latest" + home: "/opt/tools/java/openjdk/jdk-24/latest" - name: "openjdk-jdk23-latest" home: "/opt/tools/java/openjdk/jdk-23/latest" - name: "openjdk-jdk22-latest" @@ -731,6 +915,8 @@ data: installations: - name: "apache-maven-latest" home: "/opt/tools/apache-maven/latest" + - name: "apache-maven-3.9.9" + home: "/opt/tools/apache-maven/3.9.9" - name: "apache-maven-3.9.6" home: "/opt/tools/apache-maven/3.9.6" - name: "apache-maven-3.9.5" diff --git a/instances/ee4j.jakartaconfig/target/k8s/m2-dir.json b/instances/ee4j.jakartaconfig/target/k8s/m2-dir.json index 2c3b3bd25..bace9ccd3 100644 --- a/instances/ee4j.jakartaconfig/target/k8s/m2-dir.json +++ b/instances/ee4j.jakartaconfig/target/k8s/m2-dir.json @@ -2,7 +2,7 @@ "apiVersion": "v1", "data": { ".mavenrc": "set -- -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn --batch-mode \"${@}\"", - "toolchains.xml": "\n\n \n jdk\n \n JavaSE-1.8\n 1.8\n oracle\n \n /opt/tools/java/oracle/jdk-8/latest\n \n \n jdk\n \n JavaSE-9\n 9\n openjdk\n \n /opt/tools/java/openjdk/jdk-9/latest\n \n \n jdk\n \n JavaSE-10\n 10\n openjdk\n \n /opt/tools/java/openjdk/jdk-10/latest\n \n \n jdk\n \n JavaSE-11\n 11\n openjdk\n \n /opt/tools/java/openjdk/jdk-11/latest\n \n \n jdk\n \n JavaSE-12\n 12\n openjdk\n \n /opt/tools/java/openjdk/jdk-12/latest\n \n \n jdk\n \n JavaSE-13\n 13\n openjdk\n \n /opt/tools/java/openjdk/jdk-13/latest\n \n \n jdk\n \n JavaSE-14\n 14\n openjdk\n \n /opt/tools/java/openjdk/jdk-14/latest\n \n \n jdk\n \n JavaSE-15\n 15\n openjdk\n \n /opt/tools/java/openjdk/jdk-15/latest\n \n \n jdk\n \n JavaSE-16\n 16\n openjdk\n \n /opt/tools/java/openjdk/jdk-16/latest\n \n \n jdk\n \n JavaSE-17\n 17\n openjdk\n \n /opt/tools/java/openjdk/jdk-17/latest\n \n \n jdk\n \n JavaSE-18\n 18\n openjdk\n \n /opt/tools/java/openjdk/jdk-18/latest\n \n \n jdk\n \n JavaSE-19\n 19\n openjdk\n \n /opt/tools/java/openjdk/jdk-19/latest\n \n \n jdk\n \n JavaSE-20\n 20\n openjdk\n \n /opt/tools/java/openjdk/jdk-20/latest\n \n \n jdk\n \n JavaSE-21\n 21\n openjdk\n \n /opt/tools/java/openjdk/jdk-21/latest\n \n \n jdk\n \n JavaSE-22\n 22\n openjdk\n \n /opt/tools/java/openjdk/jdk-22/latest\n \n \n jdk\n \n JavaSE-23\n 23\n openjdk\n \n /opt/tools/java/openjdk/jdk-23/latest\n \n\n" + "toolchains.xml": "\n\n \n jdk\n \n JavaSE-1.8\n 1.8\n oracle\n \n /opt/tools/java/oracle/jdk-8/latest\n \n \n jdk\n \n JavaSE-9\n 9\n openjdk\n \n /opt/tools/java/openjdk/jdk-9/latest\n \n \n jdk\n \n JavaSE-10\n 10\n openjdk\n \n /opt/tools/java/openjdk/jdk-10/latest\n \n \n jdk\n \n JavaSE-11\n 11\n openjdk\n \n /opt/tools/java/openjdk/jdk-11/latest\n \n \n jdk\n \n JavaSE-12\n 12\n openjdk\n \n /opt/tools/java/openjdk/jdk-12/latest\n \n \n jdk\n \n JavaSE-13\n 13\n openjdk\n \n /opt/tools/java/openjdk/jdk-13/latest\n \n \n jdk\n \n JavaSE-14\n 14\n openjdk\n \n /opt/tools/java/openjdk/jdk-14/latest\n \n \n jdk\n \n JavaSE-15\n 15\n openjdk\n \n /opt/tools/java/openjdk/jdk-15/latest\n \n \n jdk\n \n JavaSE-16\n 16\n openjdk\n \n /opt/tools/java/openjdk/jdk-16/latest\n \n \n jdk\n \n JavaSE-17\n 17\n openjdk\n \n /opt/tools/java/openjdk/jdk-17/latest\n \n \n jdk\n \n JavaSE-18\n 18\n openjdk\n \n /opt/tools/java/openjdk/jdk-18/latest\n \n \n jdk\n \n JavaSE-19\n 19\n openjdk\n \n /opt/tools/java/openjdk/jdk-19/latest\n \n \n jdk\n \n JavaSE-20\n 20\n openjdk\n \n /opt/tools/java/openjdk/jdk-20/latest\n \n \n jdk\n \n JavaSE-21\n 21\n openjdk\n \n /opt/tools/java/openjdk/jdk-21/latest\n \n \n jdk\n \n JavaSE-22\n 22\n openjdk\n \n /opt/tools/java/openjdk/jdk-22/latest\n \n \n jdk\n \n JavaSE-23\n 23\n openjdk\n \n /opt/tools/java/openjdk/jdk-23/latest\n \n \n jdk\n \n JavaSE-24\n 24\n openjdk\n \n /opt/tools/java/openjdk/jdk-24/latest\n \n\n" }, "kind": "ConfigMap", "metadata": { diff --git a/instances/ee4j.jakartaconfig/target/k8s/statefulset.json b/instances/ee4j.jakartaconfig/target/k8s/statefulset.json index b3061abff..8eca2892a 100644 --- a/instances/ee4j.jakartaconfig/target/k8s/statefulset.json +++ b/instances/ee4j.jakartaconfig/target/k8s/statefulset.json @@ -119,6 +119,12 @@ "cpu": "250m" } }, + "securityContext": { + "seLinuxOptions": { + "level": "s0:c56,c35", + "type": "spc_t" + } + }, "volumeMounts": [ { "mountPath": "/var/jenkins", diff --git a/instances/ee4j.jakartaee-stable/config.jsonnet b/instances/ee4j.jakartaee-stable/config.jsonnet index e99e1da61..7b984f08a 100644 --- a/instances/ee4j.jakartaee-stable/config.jsonnet +++ b/instances/ee4j.jakartaee-stable/config.jsonnet @@ -9,4 +9,5 @@ "envinject", ], }, + seLinuxLevel: "s0:c42,c39", } diff --git a/instances/ee4j.jakartaee-stable/target/config.json b/instances/ee4j.jakartaee-stable/target/config.json index fe768892e..9b5e29da0 100644 --- a/instances/ee4j.jakartaee-stable/target/config.json +++ b/instances/ee4j.jakartaee-stable/target/config.json @@ -217,7 +217,7 @@ "docker.io/eclipsecbi/jiro-agent-centos-7:latest" ], "context": "centos-7", - "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-centos-7: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 [ \"uid_entrypoint\", \"/usr/local/bin/jenkins-agent\" ]\n\nADD \"https://repo.jenkins-ci.org/public/org/jenkins-ci/main/remoting/3206.3208.v409508a_675ff/remoting-3206.3208.v409508a_675ff.jar\" \"/usr/share/jenkins/agent.jar\" \nADD \"https://github.com/jenkinsci/docker-agent/raw/3206.vb_15dcf73f6a_9-12/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\nUSER 10001:0\n", + "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-centos-7: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/3206.3208.v409508a_675ff/remoting-3206.3208.v409508a_675ff.jar\" \"/usr/share/jenkins/agent.jar\"\nADD \"https://github.com/jenkinsci/docker-agent/raw/3206.vb_15dcf73f6a_9-12/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\nUSER 10001:0\n", "image": "jiro-agent-centos-7", "registry": "docker.io", "repository": "eclipsecbi", @@ -316,7 +316,7 @@ "docker.io/eclipsecbi/jiro-agent-centos-8:latest" ], "context": "centos-8", - "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-centos-8: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 [ \"uid_entrypoint\", \"/usr/local/bin/jenkins-agent\" ]\n\nADD \"https://repo.jenkins-ci.org/public/org/jenkins-ci/main/remoting/3206.3208.v409508a_675ff/remoting-3206.3208.v409508a_675ff.jar\" \"/usr/share/jenkins/agent.jar\" \nADD \"https://github.com/jenkinsci/docker-agent/raw/3206.vb_15dcf73f6a_9-12/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\nUSER 10001:0\n", + "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-centos-8: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/3206.3208.v409508a_675ff/remoting-3206.3208.v409508a_675ff.jar\" \"/usr/share/jenkins/agent.jar\"\nADD \"https://github.com/jenkinsci/docker-agent/raw/3206.vb_15dcf73f6a_9-12/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\nUSER 10001:0\n", "image": "jiro-agent-centos-8", "registry": "docker.io", "repository": "eclipsecbi", @@ -406,6 +406,203 @@ }, "startupScript": "/usr/local/bin/jenkins-agent", "username": "jenkins" + }, + "ubuntu-2204": { + "agentWorkdir": "/home/jenkins/jenkins-agent", + "docker": { + "aliases": [ + "docker.io/eclipsecbi/jiro-agent-ubuntu-2204:latest" + ], + "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-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/3206.3208.v409508a_675ff/remoting-3206.3208.v409508a_675ff.jar\" \"/usr/share/jenkins/agent.jar\"\nADD \"https://github.com/jenkinsci/docker-agent/raw/3206.vb_15dcf73f6a_9-12/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\nUSER 10001:0\n", + "image": "jiro-agent-ubuntu-2204", + "registry": "docker.io", + "repository": "eclipsecbi", + "tag": "remoting-3206.3208.v409508a_675ff" + }, + "env": { + "JAVA_TOOL_OPTIONS": [ ], + "JENKINS_REMOTING_JAVA_OPTS": [ + "-showversion", + "-XshowSettings:vm", + "-Xmx256m", + "-Dorg.jenkinsci.remoting.engine.JnlpProtocol3.disabled=true", + "-Dorg.jenkinsci.plugins.gitclient.CliGitAPIImpl.useSETSID=true" + ], + "OPENJ9_JAVA_OPTIONS": [ + "-XX:+IgnoreUnrecognizedVMOptions", + "-XX:+IdleTuningCompactOnIdle", + "-XX:+IdleTuningGcOnIdle" + ], + "_JAVA_OPTIONS": [ ] + }, + "home": "/home/jenkins", + "kubernetes": { + "inheritYamlMergeStrategy": true, + "resources": { + "cpu": { + "limit": "2000m", + "request": "1000m" + }, + "memory": { + "limit": "4096Mi", + "request": "4096Mi" + } + }, + "volumes": [ + { + "mounts": [ + { + "mountPath": "/home/jenkins/.m2/settings-security.xml", + "subPath": "settings-security.xml" + }, + { + "mountPath": "/home/jenkins/.m2/settings.xml", + "subPath": "settings.xml" + } + ], + "name": "m2-secret-dir", + "secret": { + "name": "m2-secret-dir" + } + }, + { + "configMap": { + "name": "m2-dir" + }, + "mounts": [ + { + "mountPath": "/home/jenkins/.m2/toolchains.xml", + "subPath": "toolchains.xml" + }, + { + "mountPath": "/home/jenkins/.mavenrc", + "subPath": ".mavenrc" + } + ], + "name": "m2-dir" + } + ], + "yamlMergeStrategy": "merge" + }, + "labels": [ + "ubuntu-2204" + ], + "maxHeap": "256m", + "mode": "EXCLUSIVE", + "name": "ubuntu-2204", + "remoting": { + "jar": "/usr/share/jenkins/agent.jar", + "startupScript": { + "name": "jenkins-agent", + "url": "https://github.com/jenkinsci/docker-agent/raw/3206.vb_15dcf73f6a_9-12/jenkins-agent", + "version": "3206.vb_15dcf73f6a_9-12" + }, + "url": "https://repo.jenkins-ci.org/public/org/jenkins-ci/main/remoting/3206.3208.v409508a_675ff/remoting-3206.3208.v409508a_675ff.jar", + "version": "3206.3208.v409508a_675ff" + }, + "startupScript": "/usr/local/bin/jenkins-agent", + "username": "jenkins" + }, + "ubuntu-2404": { + "agentWorkdir": "/home/jenkins/jenkins-agent", + "docker": { + "aliases": [ + "docker.io/eclipsecbi/jiro-agent-ubuntu-2404:latest" + ], + "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-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/3206.3208.v409508a_675ff/remoting-3206.3208.v409508a_675ff.jar\" \"/usr/share/jenkins/agent.jar\"\nADD \"https://github.com/jenkinsci/docker-agent/raw/3206.vb_15dcf73f6a_9-12/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\nUSER 10001:0\n", + "image": "jiro-agent-ubuntu-2404", + "registry": "docker.io", + "repository": "eclipsecbi", + "tag": "remoting-3206.3208.v409508a_675ff" + }, + "env": { + "JAVA_TOOL_OPTIONS": [ ], + "JENKINS_REMOTING_JAVA_OPTS": [ + "-showversion", + "-XshowSettings:vm", + "-Xmx256m", + "-Dorg.jenkinsci.remoting.engine.JnlpProtocol3.disabled=true", + "-Dorg.jenkinsci.plugins.gitclient.CliGitAPIImpl.useSETSID=true" + ], + "OPENJ9_JAVA_OPTIONS": [ + "-XX:+IgnoreUnrecognizedVMOptions", + "-XX:+IdleTuningCompactOnIdle", + "-XX:+IdleTuningGcOnIdle" + ], + "_JAVA_OPTIONS": [ ] + }, + "home": "/home/jenkins", + "kubernetes": { + "inheritYamlMergeStrategy": true, + "resources": { + "cpu": { + "limit": "2000m", + "request": "1000m" + }, + "memory": { + "limit": "4096Mi", + "request": "4096Mi" + } + }, + "volumes": [ + { + "mounts": [ + { + "mountPath": "/home/jenkins/.m2/settings-security.xml", + "subPath": "settings-security.xml" + }, + { + "mountPath": "/home/jenkins/.m2/settings.xml", + "subPath": "settings.xml" + } + ], + "name": "m2-secret-dir", + "secret": { + "name": "m2-secret-dir" + } + }, + { + "configMap": { + "name": "m2-dir" + }, + "mounts": [ + { + "mountPath": "/home/jenkins/.m2/toolchains.xml", + "subPath": "toolchains.xml" + }, + { + "mountPath": "/home/jenkins/.mavenrc", + "subPath": ".mavenrc" + } + ], + "name": "m2-dir" + } + ], + "yamlMergeStrategy": "merge" + }, + "labels": [ + "ubuntu-latest", + "ubuntu-2404" + ], + "maxHeap": "256m", + "mode": "EXCLUSIVE", + "name": "ubuntu-2404", + "remoting": { + "jar": "/usr/share/jenkins/agent.jar", + "startupScript": { + "name": "jenkins-agent", + "url": "https://github.com/jenkinsci/docker-agent/raw/3206.vb_15dcf73f6a_9-12/jenkins-agent", + "version": "3206.vb_15dcf73f6a_9-12" + }, + "url": "https://repo.jenkins-ci.org/public/org/jenkins-ci/main/remoting/3206.3208.v409508a_675ff/remoting-3206.3208.v409508a_675ff.jar", + "version": "3206.3208.v409508a_675ff" + }, + "startupScript": "/usr/local/bin/jenkins-agent", + "username": "jenkins" } } } @@ -703,6 +900,7 @@ }, "generate": false }, + "seLinuxLevel": "s0:c42,c39", "secrets": { "dockerconfigjson": { "dockerconfigjson-for-pull-as-default": { diff --git a/instances/ee4j.jakartaee-stable/target/jenkins/configuration.yml b/instances/ee4j.jakartaee-stable/target/jenkins/configuration.yml index b261f01c9..0a54cde09 100644 --- a/instances/ee4j.jakartaee-stable/target/jenkins/configuration.yml +++ b/instances/ee4j.jakartaee-stable/target/jenkins/configuration.yml @@ -441,6 +441,188 @@ jenkins: name: m2-dir inheritYamlMergeStrategy: "true" yamlMergeStrategy: "merge" + - name: "ubuntu-2204" + namespace: "jakartaee-stable" + label: "ubuntu-2204" + containers: + - name: "jnlp" + image: docker.io/eclipsecbi/jiro-agent-ubuntu-2204:remoting-3206.3208.v409508a_675ff + alwaysPullImage: true + livenessProbe: + failureThreshold: 0 + initialDelaySeconds: 0 + periodSeconds: 0 + successThreshold: 0 + timeoutSeconds: 0 + ttyEnabled: true + command: "" + args: "" + instanceCap: -1 + nodeUsageMode: EXCLUSIVE + envVars: + - envVar: + key: "JAVA_TOOL_OPTIONS" + 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" + - envVar: + key: "OPENJ9_JAVA_OPTIONS" + value: "-XX:+IgnoreUnrecognizedVMOptions -XX:+IdleTuningCompactOnIdle -XX:+IdleTuningGcOnIdle" + - envVar: + key: "_JAVA_OPTIONS" + value: "" + volumes: + - persistentVolumeClaim: + claimName: "tools-claim-jiro-jakartaee-stable" + mountPath: "/opt/tools" + readOnly: true + - configMapVolume: + configMapName: "known-hosts" + mountPath: "/home/jenkins/.ssh/" + subPath: "." + - emptyDirVolume: + memory: false + mountPath: "/home/jenkins/" + - emptyDirVolume: + memory: false + mountPath: "/home/jenkins/.m2/repository" + - emptyDirVolume: + memory: false + mountPath: "/home/jenkins/.m2/wrapper" + workspaceVolume: + emptyDirWorkspaceVolume: + memory: false + yaml: | + apiVersion: v1 + kind: Pod + spec: + containers: + - name: jnlp + resources: + limits: + cpu: "2000m" + memory: "4096Mi" + requests: + cpu: "1000m" + memory: "4096Mi" + volumeMounts: + - name: m2-secret-dir + mountPath: /home/jenkins/.m2/settings-security.xml + subPath: settings-security.xml + readOnly: true + - name: m2-secret-dir + mountPath: /home/jenkins/.m2/settings.xml + subPath: settings.xml + readOnly: true + - name: m2-dir + mountPath: /home/jenkins/.m2/toolchains.xml + subPath: toolchains.xml + readOnly: true + - name: m2-dir + mountPath: /home/jenkins/.mavenrc + subPath: .mavenrc + readOnly: true + volumes: + - name: m2-secret-dir + secret: + secretName: m2-secret-dir + - name: m2-dir + configMap: + name: m2-dir + inheritYamlMergeStrategy: "true" + yamlMergeStrategy: "merge" + - name: "ubuntu-2404" + namespace: "jakartaee-stable" + label: "ubuntu-latest ubuntu-2404" + containers: + - name: "jnlp" + image: docker.io/eclipsecbi/jiro-agent-ubuntu-2404:remoting-3206.3208.v409508a_675ff + alwaysPullImage: true + livenessProbe: + failureThreshold: 0 + initialDelaySeconds: 0 + periodSeconds: 0 + successThreshold: 0 + timeoutSeconds: 0 + ttyEnabled: true + command: "" + args: "" + instanceCap: -1 + nodeUsageMode: EXCLUSIVE + envVars: + - envVar: + key: "JAVA_TOOL_OPTIONS" + 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" + - envVar: + key: "OPENJ9_JAVA_OPTIONS" + value: "-XX:+IgnoreUnrecognizedVMOptions -XX:+IdleTuningCompactOnIdle -XX:+IdleTuningGcOnIdle" + - envVar: + key: "_JAVA_OPTIONS" + value: "" + volumes: + - persistentVolumeClaim: + claimName: "tools-claim-jiro-jakartaee-stable" + mountPath: "/opt/tools" + readOnly: true + - configMapVolume: + configMapName: "known-hosts" + mountPath: "/home/jenkins/.ssh/" + subPath: "." + - emptyDirVolume: + memory: false + mountPath: "/home/jenkins/" + - emptyDirVolume: + memory: false + mountPath: "/home/jenkins/.m2/repository" + - emptyDirVolume: + memory: false + mountPath: "/home/jenkins/.m2/wrapper" + workspaceVolume: + emptyDirWorkspaceVolume: + memory: false + yaml: | + apiVersion: v1 + kind: Pod + spec: + containers: + - name: jnlp + resources: + limits: + cpu: "2000m" + memory: "4096Mi" + requests: + cpu: "1000m" + memory: "4096Mi" + volumeMounts: + - name: m2-secret-dir + mountPath: /home/jenkins/.m2/settings-security.xml + subPath: settings-security.xml + readOnly: true + - name: m2-secret-dir + mountPath: /home/jenkins/.m2/settings.xml + subPath: settings.xml + readOnly: true + - name: m2-dir + mountPath: /home/jenkins/.m2/toolchains.xml + subPath: toolchains.xml + readOnly: true + - name: m2-dir + mountPath: /home/jenkins/.mavenrc + subPath: .mavenrc + readOnly: true + volumes: + - name: m2-secret-dir + secret: + secretName: m2-secret-dir + - name: m2-dir + configMap: + name: m2-dir + inheritYamlMergeStrategy: "true" + yamlMergeStrategy: "merge" security: apiToken: creationOfLegacyTokenEnabled: false @@ -535,6 +717,8 @@ tool: home: "/opt/tools/java/openjdk/latest" - name: "openjdk-ea-latest" home: "/opt/tools/java/openjdk/ea-latest" + - name: "openjdk-jdk24-latest" + home: "/opt/tools/java/openjdk/jdk-24/latest" - name: "openjdk-jdk23-latest" home: "/opt/tools/java/openjdk/jdk-23/latest" - name: "openjdk-jdk22-latest" @@ -664,6 +848,8 @@ tool: installations: - name: "apache-maven-latest" home: "/opt/tools/apache-maven/latest" + - name: "apache-maven-3.9.9" + home: "/opt/tools/apache-maven/3.9.9" - name: "apache-maven-3.9.6" home: "/opt/tools/apache-maven/3.9.6" - name: "apache-maven-3.9.5" diff --git a/instances/ee4j.jakartaee-stable/target/k8s/configmap-jenkins-config.yml b/instances/ee4j.jakartaee-stable/target/k8s/configmap-jenkins-config.yml index 39c426b86..6e4afe757 100644 --- a/instances/ee4j.jakartaee-stable/target/k8s/configmap-jenkins-config.yml +++ b/instances/ee4j.jakartaee-stable/target/k8s/configmap-jenkins-config.yml @@ -464,6 +464,188 @@ data: name: m2-dir inheritYamlMergeStrategy: "true" yamlMergeStrategy: "merge" + - name: "ubuntu-2204" + namespace: "jakartaee-stable" + label: "ubuntu-2204" + containers: + - name: "jnlp" + image: docker.io/eclipsecbi/jiro-agent-ubuntu-2204:remoting-3206.3208.v409508a_675ff + alwaysPullImage: true + livenessProbe: + failureThreshold: 0 + initialDelaySeconds: 0 + periodSeconds: 0 + successThreshold: 0 + timeoutSeconds: 0 + ttyEnabled: true + command: "" + args: "" + instanceCap: -1 + nodeUsageMode: EXCLUSIVE + envVars: + - envVar: + key: "JAVA_TOOL_OPTIONS" + 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" + - envVar: + key: "OPENJ9_JAVA_OPTIONS" + value: "-XX:+IgnoreUnrecognizedVMOptions -XX:+IdleTuningCompactOnIdle -XX:+IdleTuningGcOnIdle" + - envVar: + key: "_JAVA_OPTIONS" + value: "" + volumes: + - persistentVolumeClaim: + claimName: "tools-claim-jiro-jakartaee-stable" + mountPath: "/opt/tools" + readOnly: true + - configMapVolume: + configMapName: "known-hosts" + mountPath: "/home/jenkins/.ssh/" + subPath: "." + - emptyDirVolume: + memory: false + mountPath: "/home/jenkins/" + - emptyDirVolume: + memory: false + mountPath: "/home/jenkins/.m2/repository" + - emptyDirVolume: + memory: false + mountPath: "/home/jenkins/.m2/wrapper" + workspaceVolume: + emptyDirWorkspaceVolume: + memory: false + yaml: | + apiVersion: v1 + kind: Pod + spec: + containers: + - name: jnlp + resources: + limits: + cpu: "2000m" + memory: "4096Mi" + requests: + cpu: "1000m" + memory: "4096Mi" + volumeMounts: + - name: m2-secret-dir + mountPath: /home/jenkins/.m2/settings-security.xml + subPath: settings-security.xml + readOnly: true + - name: m2-secret-dir + mountPath: /home/jenkins/.m2/settings.xml + subPath: settings.xml + readOnly: true + - name: m2-dir + mountPath: /home/jenkins/.m2/toolchains.xml + subPath: toolchains.xml + readOnly: true + - name: m2-dir + mountPath: /home/jenkins/.mavenrc + subPath: .mavenrc + readOnly: true + volumes: + - name: m2-secret-dir + secret: + secretName: m2-secret-dir + - name: m2-dir + configMap: + name: m2-dir + inheritYamlMergeStrategy: "true" + yamlMergeStrategy: "merge" + - name: "ubuntu-2404" + namespace: "jakartaee-stable" + label: "ubuntu-latest ubuntu-2404" + containers: + - name: "jnlp" + image: docker.io/eclipsecbi/jiro-agent-ubuntu-2404:remoting-3206.3208.v409508a_675ff + alwaysPullImage: true + livenessProbe: + failureThreshold: 0 + initialDelaySeconds: 0 + periodSeconds: 0 + successThreshold: 0 + timeoutSeconds: 0 + ttyEnabled: true + command: "" + args: "" + instanceCap: -1 + nodeUsageMode: EXCLUSIVE + envVars: + - envVar: + key: "JAVA_TOOL_OPTIONS" + 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" + - envVar: + key: "OPENJ9_JAVA_OPTIONS" + value: "-XX:+IgnoreUnrecognizedVMOptions -XX:+IdleTuningCompactOnIdle -XX:+IdleTuningGcOnIdle" + - envVar: + key: "_JAVA_OPTIONS" + value: "" + volumes: + - persistentVolumeClaim: + claimName: "tools-claim-jiro-jakartaee-stable" + mountPath: "/opt/tools" + readOnly: true + - configMapVolume: + configMapName: "known-hosts" + mountPath: "/home/jenkins/.ssh/" + subPath: "." + - emptyDirVolume: + memory: false + mountPath: "/home/jenkins/" + - emptyDirVolume: + memory: false + mountPath: "/home/jenkins/.m2/repository" + - emptyDirVolume: + memory: false + mountPath: "/home/jenkins/.m2/wrapper" + workspaceVolume: + emptyDirWorkspaceVolume: + memory: false + yaml: | + apiVersion: v1 + kind: Pod + spec: + containers: + - name: jnlp + resources: + limits: + cpu: "2000m" + memory: "4096Mi" + requests: + cpu: "1000m" + memory: "4096Mi" + volumeMounts: + - name: m2-secret-dir + mountPath: /home/jenkins/.m2/settings-security.xml + subPath: settings-security.xml + readOnly: true + - name: m2-secret-dir + mountPath: /home/jenkins/.m2/settings.xml + subPath: settings.xml + readOnly: true + - name: m2-dir + mountPath: /home/jenkins/.m2/toolchains.xml + subPath: toolchains.xml + readOnly: true + - name: m2-dir + mountPath: /home/jenkins/.mavenrc + subPath: .mavenrc + readOnly: true + volumes: + - name: m2-secret-dir + secret: + secretName: m2-secret-dir + - name: m2-dir + configMap: + name: m2-dir + inheritYamlMergeStrategy: "true" + yamlMergeStrategy: "merge" security: apiToken: creationOfLegacyTokenEnabled: false @@ -558,6 +740,8 @@ data: home: "/opt/tools/java/openjdk/latest" - name: "openjdk-ea-latest" home: "/opt/tools/java/openjdk/ea-latest" + - name: "openjdk-jdk24-latest" + home: "/opt/tools/java/openjdk/jdk-24/latest" - name: "openjdk-jdk23-latest" home: "/opt/tools/java/openjdk/jdk-23/latest" - name: "openjdk-jdk22-latest" @@ -687,6 +871,8 @@ data: installations: - name: "apache-maven-latest" home: "/opt/tools/apache-maven/latest" + - name: "apache-maven-3.9.9" + home: "/opt/tools/apache-maven/3.9.9" - name: "apache-maven-3.9.6" home: "/opt/tools/apache-maven/3.9.6" - name: "apache-maven-3.9.5" diff --git a/instances/ee4j.jakartaee-stable/target/k8s/m2-dir.json b/instances/ee4j.jakartaee-stable/target/k8s/m2-dir.json index d33c7e9f5..b6f020677 100644 --- a/instances/ee4j.jakartaee-stable/target/k8s/m2-dir.json +++ b/instances/ee4j.jakartaee-stable/target/k8s/m2-dir.json @@ -2,7 +2,7 @@ "apiVersion": "v1", "data": { ".mavenrc": "set -- -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn --batch-mode \"${@}\"", - "toolchains.xml": "\n\n \n jdk\n \n JavaSE-1.8\n 1.8\n oracle\n \n /opt/tools/java/oracle/jdk-8/latest\n \n \n jdk\n \n JavaSE-9\n 9\n openjdk\n \n /opt/tools/java/openjdk/jdk-9/latest\n \n \n jdk\n \n JavaSE-10\n 10\n openjdk\n \n /opt/tools/java/openjdk/jdk-10/latest\n \n \n jdk\n \n JavaSE-11\n 11\n openjdk\n \n /opt/tools/java/openjdk/jdk-11/latest\n \n \n jdk\n \n JavaSE-12\n 12\n openjdk\n \n /opt/tools/java/openjdk/jdk-12/latest\n \n \n jdk\n \n JavaSE-13\n 13\n openjdk\n \n /opt/tools/java/openjdk/jdk-13/latest\n \n \n jdk\n \n JavaSE-14\n 14\n openjdk\n \n /opt/tools/java/openjdk/jdk-14/latest\n \n \n jdk\n \n JavaSE-15\n 15\n openjdk\n \n /opt/tools/java/openjdk/jdk-15/latest\n \n \n jdk\n \n JavaSE-16\n 16\n openjdk\n \n /opt/tools/java/openjdk/jdk-16/latest\n \n \n jdk\n \n JavaSE-17\n 17\n openjdk\n \n /opt/tools/java/openjdk/jdk-17/latest\n \n \n jdk\n \n JavaSE-18\n 18\n openjdk\n \n /opt/tools/java/openjdk/jdk-18/latest\n \n \n jdk\n \n JavaSE-19\n 19\n openjdk\n \n /opt/tools/java/openjdk/jdk-19/latest\n \n \n jdk\n \n JavaSE-20\n 20\n openjdk\n \n /opt/tools/java/openjdk/jdk-20/latest\n \n \n jdk\n \n JavaSE-21\n 21\n openjdk\n \n /opt/tools/java/openjdk/jdk-21/latest\n \n \n jdk\n \n JavaSE-22\n 22\n openjdk\n \n /opt/tools/java/openjdk/jdk-22/latest\n \n \n jdk\n \n JavaSE-23\n 23\n openjdk\n \n /opt/tools/java/openjdk/jdk-23/latest\n \n\n" + "toolchains.xml": "\n\n \n jdk\n \n JavaSE-1.8\n 1.8\n oracle\n \n /opt/tools/java/oracle/jdk-8/latest\n \n \n jdk\n \n JavaSE-9\n 9\n openjdk\n \n /opt/tools/java/openjdk/jdk-9/latest\n \n \n jdk\n \n JavaSE-10\n 10\n openjdk\n \n /opt/tools/java/openjdk/jdk-10/latest\n \n \n jdk\n \n JavaSE-11\n 11\n openjdk\n \n /opt/tools/java/openjdk/jdk-11/latest\n \n \n jdk\n \n JavaSE-12\n 12\n openjdk\n \n /opt/tools/java/openjdk/jdk-12/latest\n \n \n jdk\n \n JavaSE-13\n 13\n openjdk\n \n /opt/tools/java/openjdk/jdk-13/latest\n \n \n jdk\n \n JavaSE-14\n 14\n openjdk\n \n /opt/tools/java/openjdk/jdk-14/latest\n \n \n jdk\n \n JavaSE-15\n 15\n openjdk\n \n /opt/tools/java/openjdk/jdk-15/latest\n \n \n jdk\n \n JavaSE-16\n 16\n openjdk\n \n /opt/tools/java/openjdk/jdk-16/latest\n \n \n jdk\n \n JavaSE-17\n 17\n openjdk\n \n /opt/tools/java/openjdk/jdk-17/latest\n \n \n jdk\n \n JavaSE-18\n 18\n openjdk\n \n /opt/tools/java/openjdk/jdk-18/latest\n \n \n jdk\n \n JavaSE-19\n 19\n openjdk\n \n /opt/tools/java/openjdk/jdk-19/latest\n \n \n jdk\n \n JavaSE-20\n 20\n openjdk\n \n /opt/tools/java/openjdk/jdk-20/latest\n \n \n jdk\n \n JavaSE-21\n 21\n openjdk\n \n /opt/tools/java/openjdk/jdk-21/latest\n \n \n jdk\n \n JavaSE-22\n 22\n openjdk\n \n /opt/tools/java/openjdk/jdk-22/latest\n \n \n jdk\n \n JavaSE-23\n 23\n openjdk\n \n /opt/tools/java/openjdk/jdk-23/latest\n \n \n jdk\n \n JavaSE-24\n 24\n openjdk\n \n /opt/tools/java/openjdk/jdk-24/latest\n \n\n" }, "kind": "ConfigMap", "metadata": { diff --git a/instances/ee4j.jakartaee-stable/target/k8s/statefulset.json b/instances/ee4j.jakartaee-stable/target/k8s/statefulset.json index 7ef6e6f5b..71242873a 100644 --- a/instances/ee4j.jakartaee-stable/target/k8s/statefulset.json +++ b/instances/ee4j.jakartaee-stable/target/k8s/statefulset.json @@ -119,6 +119,12 @@ "cpu": "250m" } }, + "securityContext": { + "seLinuxOptions": { + "level": "s0:c42,c39", + "type": "spc_t" + } + }, "volumeMounts": [ { "mountPath": "/var/jenkins", diff --git a/instances/ee4j.jaxb/config.jsonnet b/instances/ee4j.jaxb/config.jsonnet index 099f8bfd1..19c1ddd77 100644 --- a/instances/ee4j.jaxb/config.jsonnet +++ b/instances/ee4j.jaxb/config.jsonnet @@ -7,5 +7,6 @@ plugins+: [ "envinject", ], - } + }, + seLinuxLevel: "s0:c43,c17", } diff --git a/instances/ee4j.jaxb/target/config.json b/instances/ee4j.jaxb/target/config.json index beebe4dbc..fa830dd03 100644 --- a/instances/ee4j.jaxb/target/config.json +++ b/instances/ee4j.jaxb/target/config.json @@ -217,7 +217,7 @@ "docker.io/eclipsecbi/jiro-agent-centos-7:latest" ], "context": "centos-7", - "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-centos-7: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 [ \"uid_entrypoint\", \"/usr/local/bin/jenkins-agent\" ]\n\nADD \"https://repo.jenkins-ci.org/public/org/jenkins-ci/main/remoting/3206.3208.v409508a_675ff/remoting-3206.3208.v409508a_675ff.jar\" \"/usr/share/jenkins/agent.jar\" \nADD \"https://github.com/jenkinsci/docker-agent/raw/3206.vb_15dcf73f6a_9-12/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\nUSER 10001:0\n", + "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-centos-7: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/3206.3208.v409508a_675ff/remoting-3206.3208.v409508a_675ff.jar\" \"/usr/share/jenkins/agent.jar\"\nADD \"https://github.com/jenkinsci/docker-agent/raw/3206.vb_15dcf73f6a_9-12/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\nUSER 10001:0\n", "image": "jiro-agent-centos-7", "registry": "docker.io", "repository": "eclipsecbi", @@ -316,7 +316,7 @@ "docker.io/eclipsecbi/jiro-agent-centos-8:latest" ], "context": "centos-8", - "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-centos-8: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 [ \"uid_entrypoint\", \"/usr/local/bin/jenkins-agent\" ]\n\nADD \"https://repo.jenkins-ci.org/public/org/jenkins-ci/main/remoting/3206.3208.v409508a_675ff/remoting-3206.3208.v409508a_675ff.jar\" \"/usr/share/jenkins/agent.jar\" \nADD \"https://github.com/jenkinsci/docker-agent/raw/3206.vb_15dcf73f6a_9-12/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\nUSER 10001:0\n", + "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-centos-8: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/3206.3208.v409508a_675ff/remoting-3206.3208.v409508a_675ff.jar\" \"/usr/share/jenkins/agent.jar\"\nADD \"https://github.com/jenkinsci/docker-agent/raw/3206.vb_15dcf73f6a_9-12/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\nUSER 10001:0\n", "image": "jiro-agent-centos-8", "registry": "docker.io", "repository": "eclipsecbi", @@ -406,6 +406,203 @@ }, "startupScript": "/usr/local/bin/jenkins-agent", "username": "jenkins" + }, + "ubuntu-2204": { + "agentWorkdir": "/home/jenkins/jenkins-agent", + "docker": { + "aliases": [ + "docker.io/eclipsecbi/jiro-agent-ubuntu-2204:latest" + ], + "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-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/3206.3208.v409508a_675ff/remoting-3206.3208.v409508a_675ff.jar\" \"/usr/share/jenkins/agent.jar\"\nADD \"https://github.com/jenkinsci/docker-agent/raw/3206.vb_15dcf73f6a_9-12/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\nUSER 10001:0\n", + "image": "jiro-agent-ubuntu-2204", + "registry": "docker.io", + "repository": "eclipsecbi", + "tag": "remoting-3206.3208.v409508a_675ff" + }, + "env": { + "JAVA_TOOL_OPTIONS": [ ], + "JENKINS_REMOTING_JAVA_OPTS": [ + "-showversion", + "-XshowSettings:vm", + "-Xmx256m", + "-Dorg.jenkinsci.remoting.engine.JnlpProtocol3.disabled=true", + "-Dorg.jenkinsci.plugins.gitclient.CliGitAPIImpl.useSETSID=true" + ], + "OPENJ9_JAVA_OPTIONS": [ + "-XX:+IgnoreUnrecognizedVMOptions", + "-XX:+IdleTuningCompactOnIdle", + "-XX:+IdleTuningGcOnIdle" + ], + "_JAVA_OPTIONS": [ ] + }, + "home": "/home/jenkins", + "kubernetes": { + "inheritYamlMergeStrategy": true, + "resources": { + "cpu": { + "limit": "2000m", + "request": "1000m" + }, + "memory": { + "limit": "4096Mi", + "request": "4096Mi" + } + }, + "volumes": [ + { + "mounts": [ + { + "mountPath": "/home/jenkins/.m2/settings-security.xml", + "subPath": "settings-security.xml" + }, + { + "mountPath": "/home/jenkins/.m2/settings.xml", + "subPath": "settings.xml" + } + ], + "name": "m2-secret-dir", + "secret": { + "name": "m2-secret-dir" + } + }, + { + "configMap": { + "name": "m2-dir" + }, + "mounts": [ + { + "mountPath": "/home/jenkins/.m2/toolchains.xml", + "subPath": "toolchains.xml" + }, + { + "mountPath": "/home/jenkins/.mavenrc", + "subPath": ".mavenrc" + } + ], + "name": "m2-dir" + } + ], + "yamlMergeStrategy": "merge" + }, + "labels": [ + "ubuntu-2204" + ], + "maxHeap": "256m", + "mode": "EXCLUSIVE", + "name": "ubuntu-2204", + "remoting": { + "jar": "/usr/share/jenkins/agent.jar", + "startupScript": { + "name": "jenkins-agent", + "url": "https://github.com/jenkinsci/docker-agent/raw/3206.vb_15dcf73f6a_9-12/jenkins-agent", + "version": "3206.vb_15dcf73f6a_9-12" + }, + "url": "https://repo.jenkins-ci.org/public/org/jenkins-ci/main/remoting/3206.3208.v409508a_675ff/remoting-3206.3208.v409508a_675ff.jar", + "version": "3206.3208.v409508a_675ff" + }, + "startupScript": "/usr/local/bin/jenkins-agent", + "username": "jenkins" + }, + "ubuntu-2404": { + "agentWorkdir": "/home/jenkins/jenkins-agent", + "docker": { + "aliases": [ + "docker.io/eclipsecbi/jiro-agent-ubuntu-2404:latest" + ], + "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-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/3206.3208.v409508a_675ff/remoting-3206.3208.v409508a_675ff.jar\" \"/usr/share/jenkins/agent.jar\"\nADD \"https://github.com/jenkinsci/docker-agent/raw/3206.vb_15dcf73f6a_9-12/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\nUSER 10001:0\n", + "image": "jiro-agent-ubuntu-2404", + "registry": "docker.io", + "repository": "eclipsecbi", + "tag": "remoting-3206.3208.v409508a_675ff" + }, + "env": { + "JAVA_TOOL_OPTIONS": [ ], + "JENKINS_REMOTING_JAVA_OPTS": [ + "-showversion", + "-XshowSettings:vm", + "-Xmx256m", + "-Dorg.jenkinsci.remoting.engine.JnlpProtocol3.disabled=true", + "-Dorg.jenkinsci.plugins.gitclient.CliGitAPIImpl.useSETSID=true" + ], + "OPENJ9_JAVA_OPTIONS": [ + "-XX:+IgnoreUnrecognizedVMOptions", + "-XX:+IdleTuningCompactOnIdle", + "-XX:+IdleTuningGcOnIdle" + ], + "_JAVA_OPTIONS": [ ] + }, + "home": "/home/jenkins", + "kubernetes": { + "inheritYamlMergeStrategy": true, + "resources": { + "cpu": { + "limit": "2000m", + "request": "1000m" + }, + "memory": { + "limit": "4096Mi", + "request": "4096Mi" + } + }, + "volumes": [ + { + "mounts": [ + { + "mountPath": "/home/jenkins/.m2/settings-security.xml", + "subPath": "settings-security.xml" + }, + { + "mountPath": "/home/jenkins/.m2/settings.xml", + "subPath": "settings.xml" + } + ], + "name": "m2-secret-dir", + "secret": { + "name": "m2-secret-dir" + } + }, + { + "configMap": { + "name": "m2-dir" + }, + "mounts": [ + { + "mountPath": "/home/jenkins/.m2/toolchains.xml", + "subPath": "toolchains.xml" + }, + { + "mountPath": "/home/jenkins/.mavenrc", + "subPath": ".mavenrc" + } + ], + "name": "m2-dir" + } + ], + "yamlMergeStrategy": "merge" + }, + "labels": [ + "ubuntu-latest", + "ubuntu-2404" + ], + "maxHeap": "256m", + "mode": "EXCLUSIVE", + "name": "ubuntu-2404", + "remoting": { + "jar": "/usr/share/jenkins/agent.jar", + "startupScript": { + "name": "jenkins-agent", + "url": "https://github.com/jenkinsci/docker-agent/raw/3206.vb_15dcf73f6a_9-12/jenkins-agent", + "version": "3206.vb_15dcf73f6a_9-12" + }, + "url": "https://repo.jenkins-ci.org/public/org/jenkins-ci/main/remoting/3206.3208.v409508a_675ff/remoting-3206.3208.v409508a_675ff.jar", + "version": "3206.3208.v409508a_675ff" + }, + "startupScript": "/usr/local/bin/jenkins-agent", + "username": "jenkins" } } } @@ -754,6 +951,7 @@ }, "generate": false }, + "seLinuxLevel": "s0:c43,c17", "secrets": { "dockerconfigjson": { "dockerconfigjson-for-pull-as-default": { diff --git a/instances/ee4j.jaxb/target/jenkins/configuration.yml b/instances/ee4j.jaxb/target/jenkins/configuration.yml index 92c889af5..237f502b6 100644 --- a/instances/ee4j.jaxb/target/jenkins/configuration.yml +++ b/instances/ee4j.jaxb/target/jenkins/configuration.yml @@ -485,6 +485,188 @@ jenkins: name: m2-dir inheritYamlMergeStrategy: "true" yamlMergeStrategy: "merge" + - name: "ubuntu-2204" + namespace: "jaxb" + label: "ubuntu-2204" + containers: + - name: "jnlp" + image: docker.io/eclipsecbi/jiro-agent-ubuntu-2204:remoting-3206.3208.v409508a_675ff + alwaysPullImage: true + livenessProbe: + failureThreshold: 0 + initialDelaySeconds: 0 + periodSeconds: 0 + successThreshold: 0 + timeoutSeconds: 0 + ttyEnabled: true + command: "" + args: "" + instanceCap: -1 + nodeUsageMode: EXCLUSIVE + envVars: + - envVar: + key: "JAVA_TOOL_OPTIONS" + 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" + - envVar: + key: "OPENJ9_JAVA_OPTIONS" + value: "-XX:+IgnoreUnrecognizedVMOptions -XX:+IdleTuningCompactOnIdle -XX:+IdleTuningGcOnIdle" + - envVar: + key: "_JAVA_OPTIONS" + value: "" + volumes: + - persistentVolumeClaim: + claimName: "tools-claim-jiro-jaxb" + mountPath: "/opt/tools" + readOnly: true + - configMapVolume: + configMapName: "known-hosts" + mountPath: "/home/jenkins/.ssh/" + subPath: "." + - emptyDirVolume: + memory: false + mountPath: "/home/jenkins/" + - emptyDirVolume: + memory: false + mountPath: "/home/jenkins/.m2/repository" + - emptyDirVolume: + memory: false + mountPath: "/home/jenkins/.m2/wrapper" + workspaceVolume: + emptyDirWorkspaceVolume: + memory: false + yaml: | + apiVersion: v1 + kind: Pod + spec: + containers: + - name: jnlp + resources: + limits: + cpu: "2000m" + memory: "4096Mi" + requests: + cpu: "1000m" + memory: "4096Mi" + volumeMounts: + - name: m2-secret-dir + mountPath: /home/jenkins/.m2/settings-security.xml + subPath: settings-security.xml + readOnly: true + - name: m2-secret-dir + mountPath: /home/jenkins/.m2/settings.xml + subPath: settings.xml + readOnly: true + - name: m2-dir + mountPath: /home/jenkins/.m2/toolchains.xml + subPath: toolchains.xml + readOnly: true + - name: m2-dir + mountPath: /home/jenkins/.mavenrc + subPath: .mavenrc + readOnly: true + volumes: + - name: m2-secret-dir + secret: + secretName: m2-secret-dir + - name: m2-dir + configMap: + name: m2-dir + inheritYamlMergeStrategy: "true" + yamlMergeStrategy: "merge" + - name: "ubuntu-2404" + namespace: "jaxb" + label: "ubuntu-latest ubuntu-2404" + containers: + - name: "jnlp" + image: docker.io/eclipsecbi/jiro-agent-ubuntu-2404:remoting-3206.3208.v409508a_675ff + alwaysPullImage: true + livenessProbe: + failureThreshold: 0 + initialDelaySeconds: 0 + periodSeconds: 0 + successThreshold: 0 + timeoutSeconds: 0 + ttyEnabled: true + command: "" + args: "" + instanceCap: -1 + nodeUsageMode: EXCLUSIVE + envVars: + - envVar: + key: "JAVA_TOOL_OPTIONS" + 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" + - envVar: + key: "OPENJ9_JAVA_OPTIONS" + value: "-XX:+IgnoreUnrecognizedVMOptions -XX:+IdleTuningCompactOnIdle -XX:+IdleTuningGcOnIdle" + - envVar: + key: "_JAVA_OPTIONS" + value: "" + volumes: + - persistentVolumeClaim: + claimName: "tools-claim-jiro-jaxb" + mountPath: "/opt/tools" + readOnly: true + - configMapVolume: + configMapName: "known-hosts" + mountPath: "/home/jenkins/.ssh/" + subPath: "." + - emptyDirVolume: + memory: false + mountPath: "/home/jenkins/" + - emptyDirVolume: + memory: false + mountPath: "/home/jenkins/.m2/repository" + - emptyDirVolume: + memory: false + mountPath: "/home/jenkins/.m2/wrapper" + workspaceVolume: + emptyDirWorkspaceVolume: + memory: false + yaml: | + apiVersion: v1 + kind: Pod + spec: + containers: + - name: jnlp + resources: + limits: + cpu: "2000m" + memory: "4096Mi" + requests: + cpu: "1000m" + memory: "4096Mi" + volumeMounts: + - name: m2-secret-dir + mountPath: /home/jenkins/.m2/settings-security.xml + subPath: settings-security.xml + readOnly: true + - name: m2-secret-dir + mountPath: /home/jenkins/.m2/settings.xml + subPath: settings.xml + readOnly: true + - name: m2-dir + mountPath: /home/jenkins/.m2/toolchains.xml + subPath: toolchains.xml + readOnly: true + - name: m2-dir + mountPath: /home/jenkins/.mavenrc + subPath: .mavenrc + readOnly: true + volumes: + - name: m2-secret-dir + secret: + secretName: m2-secret-dir + - name: m2-dir + configMap: + name: m2-dir + inheritYamlMergeStrategy: "true" + yamlMergeStrategy: "merge" security: apiToken: creationOfLegacyTokenEnabled: false @@ -579,6 +761,8 @@ tool: home: "/opt/tools/java/openjdk/latest" - name: "openjdk-ea-latest" home: "/opt/tools/java/openjdk/ea-latest" + - name: "openjdk-jdk24-latest" + home: "/opt/tools/java/openjdk/jdk-24/latest" - name: "openjdk-jdk23-latest" home: "/opt/tools/java/openjdk/jdk-23/latest" - name: "openjdk-jdk22-latest" @@ -708,6 +892,8 @@ tool: installations: - name: "apache-maven-latest" home: "/opt/tools/apache-maven/latest" + - name: "apache-maven-3.9.9" + home: "/opt/tools/apache-maven/3.9.9" - name: "apache-maven-3.9.6" home: "/opt/tools/apache-maven/3.9.6" - name: "apache-maven-3.9.5" diff --git a/instances/ee4j.jaxb/target/k8s/configmap-jenkins-config.yml b/instances/ee4j.jaxb/target/k8s/configmap-jenkins-config.yml index e365f81ed..b11869435 100644 --- a/instances/ee4j.jaxb/target/k8s/configmap-jenkins-config.yml +++ b/instances/ee4j.jaxb/target/k8s/configmap-jenkins-config.yml @@ -508,6 +508,188 @@ data: name: m2-dir inheritYamlMergeStrategy: "true" yamlMergeStrategy: "merge" + - name: "ubuntu-2204" + namespace: "jaxb" + label: "ubuntu-2204" + containers: + - name: "jnlp" + image: docker.io/eclipsecbi/jiro-agent-ubuntu-2204:remoting-3206.3208.v409508a_675ff + alwaysPullImage: true + livenessProbe: + failureThreshold: 0 + initialDelaySeconds: 0 + periodSeconds: 0 + successThreshold: 0 + timeoutSeconds: 0 + ttyEnabled: true + command: "" + args: "" + instanceCap: -1 + nodeUsageMode: EXCLUSIVE + envVars: + - envVar: + key: "JAVA_TOOL_OPTIONS" + 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" + - envVar: + key: "OPENJ9_JAVA_OPTIONS" + value: "-XX:+IgnoreUnrecognizedVMOptions -XX:+IdleTuningCompactOnIdle -XX:+IdleTuningGcOnIdle" + - envVar: + key: "_JAVA_OPTIONS" + value: "" + volumes: + - persistentVolumeClaim: + claimName: "tools-claim-jiro-jaxb" + mountPath: "/opt/tools" + readOnly: true + - configMapVolume: + configMapName: "known-hosts" + mountPath: "/home/jenkins/.ssh/" + subPath: "." + - emptyDirVolume: + memory: false + mountPath: "/home/jenkins/" + - emptyDirVolume: + memory: false + mountPath: "/home/jenkins/.m2/repository" + - emptyDirVolume: + memory: false + mountPath: "/home/jenkins/.m2/wrapper" + workspaceVolume: + emptyDirWorkspaceVolume: + memory: false + yaml: | + apiVersion: v1 + kind: Pod + spec: + containers: + - name: jnlp + resources: + limits: + cpu: "2000m" + memory: "4096Mi" + requests: + cpu: "1000m" + memory: "4096Mi" + volumeMounts: + - name: m2-secret-dir + mountPath: /home/jenkins/.m2/settings-security.xml + subPath: settings-security.xml + readOnly: true + - name: m2-secret-dir + mountPath: /home/jenkins/.m2/settings.xml + subPath: settings.xml + readOnly: true + - name: m2-dir + mountPath: /home/jenkins/.m2/toolchains.xml + subPath: toolchains.xml + readOnly: true + - name: m2-dir + mountPath: /home/jenkins/.mavenrc + subPath: .mavenrc + readOnly: true + volumes: + - name: m2-secret-dir + secret: + secretName: m2-secret-dir + - name: m2-dir + configMap: + name: m2-dir + inheritYamlMergeStrategy: "true" + yamlMergeStrategy: "merge" + - name: "ubuntu-2404" + namespace: "jaxb" + label: "ubuntu-latest ubuntu-2404" + containers: + - name: "jnlp" + image: docker.io/eclipsecbi/jiro-agent-ubuntu-2404:remoting-3206.3208.v409508a_675ff + alwaysPullImage: true + livenessProbe: + failureThreshold: 0 + initialDelaySeconds: 0 + periodSeconds: 0 + successThreshold: 0 + timeoutSeconds: 0 + ttyEnabled: true + command: "" + args: "" + instanceCap: -1 + nodeUsageMode: EXCLUSIVE + envVars: + - envVar: + key: "JAVA_TOOL_OPTIONS" + 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" + - envVar: + key: "OPENJ9_JAVA_OPTIONS" + value: "-XX:+IgnoreUnrecognizedVMOptions -XX:+IdleTuningCompactOnIdle -XX:+IdleTuningGcOnIdle" + - envVar: + key: "_JAVA_OPTIONS" + value: "" + volumes: + - persistentVolumeClaim: + claimName: "tools-claim-jiro-jaxb" + mountPath: "/opt/tools" + readOnly: true + - configMapVolume: + configMapName: "known-hosts" + mountPath: "/home/jenkins/.ssh/" + subPath: "." + - emptyDirVolume: + memory: false + mountPath: "/home/jenkins/" + - emptyDirVolume: + memory: false + mountPath: "/home/jenkins/.m2/repository" + - emptyDirVolume: + memory: false + mountPath: "/home/jenkins/.m2/wrapper" + workspaceVolume: + emptyDirWorkspaceVolume: + memory: false + yaml: | + apiVersion: v1 + kind: Pod + spec: + containers: + - name: jnlp + resources: + limits: + cpu: "2000m" + memory: "4096Mi" + requests: + cpu: "1000m" + memory: "4096Mi" + volumeMounts: + - name: m2-secret-dir + mountPath: /home/jenkins/.m2/settings-security.xml + subPath: settings-security.xml + readOnly: true + - name: m2-secret-dir + mountPath: /home/jenkins/.m2/settings.xml + subPath: settings.xml + readOnly: true + - name: m2-dir + mountPath: /home/jenkins/.m2/toolchains.xml + subPath: toolchains.xml + readOnly: true + - name: m2-dir + mountPath: /home/jenkins/.mavenrc + subPath: .mavenrc + readOnly: true + volumes: + - name: m2-secret-dir + secret: + secretName: m2-secret-dir + - name: m2-dir + configMap: + name: m2-dir + inheritYamlMergeStrategy: "true" + yamlMergeStrategy: "merge" security: apiToken: creationOfLegacyTokenEnabled: false @@ -602,6 +784,8 @@ data: home: "/opt/tools/java/openjdk/latest" - name: "openjdk-ea-latest" home: "/opt/tools/java/openjdk/ea-latest" + - name: "openjdk-jdk24-latest" + home: "/opt/tools/java/openjdk/jdk-24/latest" - name: "openjdk-jdk23-latest" home: "/opt/tools/java/openjdk/jdk-23/latest" - name: "openjdk-jdk22-latest" @@ -731,6 +915,8 @@ data: installations: - name: "apache-maven-latest" home: "/opt/tools/apache-maven/latest" + - name: "apache-maven-3.9.9" + home: "/opt/tools/apache-maven/3.9.9" - name: "apache-maven-3.9.6" home: "/opt/tools/apache-maven/3.9.6" - name: "apache-maven-3.9.5" diff --git a/instances/ee4j.jaxb/target/k8s/m2-dir.json b/instances/ee4j.jaxb/target/k8s/m2-dir.json index 1565b2ac5..36b5d44b4 100644 --- a/instances/ee4j.jaxb/target/k8s/m2-dir.json +++ b/instances/ee4j.jaxb/target/k8s/m2-dir.json @@ -2,7 +2,7 @@ "apiVersion": "v1", "data": { ".mavenrc": "set -- -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn --batch-mode \"${@}\"", - "toolchains.xml": "\n\n \n jdk\n \n JavaSE-1.8\n 1.8\n oracle\n \n /opt/tools/java/oracle/jdk-8/latest\n \n \n jdk\n \n JavaSE-9\n 9\n openjdk\n \n /opt/tools/java/openjdk/jdk-9/latest\n \n \n jdk\n \n JavaSE-10\n 10\n openjdk\n \n /opt/tools/java/openjdk/jdk-10/latest\n \n \n jdk\n \n JavaSE-11\n 11\n openjdk\n \n /opt/tools/java/openjdk/jdk-11/latest\n \n \n jdk\n \n JavaSE-12\n 12\n openjdk\n \n /opt/tools/java/openjdk/jdk-12/latest\n \n \n jdk\n \n JavaSE-13\n 13\n openjdk\n \n /opt/tools/java/openjdk/jdk-13/latest\n \n \n jdk\n \n JavaSE-14\n 14\n openjdk\n \n /opt/tools/java/openjdk/jdk-14/latest\n \n \n jdk\n \n JavaSE-15\n 15\n openjdk\n \n /opt/tools/java/openjdk/jdk-15/latest\n \n \n jdk\n \n JavaSE-16\n 16\n openjdk\n \n /opt/tools/java/openjdk/jdk-16/latest\n \n \n jdk\n \n JavaSE-17\n 17\n openjdk\n \n /opt/tools/java/openjdk/jdk-17/latest\n \n \n jdk\n \n JavaSE-18\n 18\n openjdk\n \n /opt/tools/java/openjdk/jdk-18/latest\n \n \n jdk\n \n JavaSE-19\n 19\n openjdk\n \n /opt/tools/java/openjdk/jdk-19/latest\n \n \n jdk\n \n JavaSE-20\n 20\n openjdk\n \n /opt/tools/java/openjdk/jdk-20/latest\n \n \n jdk\n \n JavaSE-21\n 21\n openjdk\n \n /opt/tools/java/openjdk/jdk-21/latest\n \n \n jdk\n \n JavaSE-22\n 22\n openjdk\n \n /opt/tools/java/openjdk/jdk-22/latest\n \n \n jdk\n \n JavaSE-23\n 23\n openjdk\n \n /opt/tools/java/openjdk/jdk-23/latest\n \n\n" + "toolchains.xml": "\n\n \n jdk\n \n JavaSE-1.8\n 1.8\n oracle\n \n /opt/tools/java/oracle/jdk-8/latest\n \n \n jdk\n \n JavaSE-9\n 9\n openjdk\n \n /opt/tools/java/openjdk/jdk-9/latest\n \n \n jdk\n \n JavaSE-10\n 10\n openjdk\n \n /opt/tools/java/openjdk/jdk-10/latest\n \n \n jdk\n \n JavaSE-11\n 11\n openjdk\n \n /opt/tools/java/openjdk/jdk-11/latest\n \n \n jdk\n \n JavaSE-12\n 12\n openjdk\n \n /opt/tools/java/openjdk/jdk-12/latest\n \n \n jdk\n \n JavaSE-13\n 13\n openjdk\n \n /opt/tools/java/openjdk/jdk-13/latest\n \n \n jdk\n \n JavaSE-14\n 14\n openjdk\n \n /opt/tools/java/openjdk/jdk-14/latest\n \n \n jdk\n \n JavaSE-15\n 15\n openjdk\n \n /opt/tools/java/openjdk/jdk-15/latest\n \n \n jdk\n \n JavaSE-16\n 16\n openjdk\n \n /opt/tools/java/openjdk/jdk-16/latest\n \n \n jdk\n \n JavaSE-17\n 17\n openjdk\n \n /opt/tools/java/openjdk/jdk-17/latest\n \n \n jdk\n \n JavaSE-18\n 18\n openjdk\n \n /opt/tools/java/openjdk/jdk-18/latest\n \n \n jdk\n \n JavaSE-19\n 19\n openjdk\n \n /opt/tools/java/openjdk/jdk-19/latest\n \n \n jdk\n \n JavaSE-20\n 20\n openjdk\n \n /opt/tools/java/openjdk/jdk-20/latest\n \n \n jdk\n \n JavaSE-21\n 21\n openjdk\n \n /opt/tools/java/openjdk/jdk-21/latest\n \n \n jdk\n \n JavaSE-22\n 22\n openjdk\n \n /opt/tools/java/openjdk/jdk-22/latest\n \n \n jdk\n \n JavaSE-23\n 23\n openjdk\n \n /opt/tools/java/openjdk/jdk-23/latest\n \n \n jdk\n \n JavaSE-24\n 24\n openjdk\n \n /opt/tools/java/openjdk/jdk-24/latest\n \n\n" }, "kind": "ConfigMap", "metadata": { diff --git a/instances/ee4j.jaxb/target/k8s/statefulset.json b/instances/ee4j.jaxb/target/k8s/statefulset.json index 8025bd03f..08010688a 100644 --- a/instances/ee4j.jaxb/target/k8s/statefulset.json +++ b/instances/ee4j.jaxb/target/k8s/statefulset.json @@ -119,6 +119,12 @@ "cpu": "250m" } }, + "securityContext": { + "seLinuxOptions": { + "level": "s0:c43,c17", + "type": "spc_t" + } + }, "volumeMounts": [ { "mountPath": "/var/jenkins", diff --git a/instances/ee4j.jca/config.jsonnet b/instances/ee4j.jca/config.jsonnet index a21d696f4..49e7398f8 100644 --- a/instances/ee4j.jca/config.jsonnet +++ b/instances/ee4j.jca/config.jsonnet @@ -8,4 +8,5 @@ "copyartifact", ], }, + seLinuxLevel: "s0:c43,c32", } diff --git a/instances/ee4j.jca/target/config.json b/instances/ee4j.jca/target/config.json index 27b3493f7..d346c0978 100644 --- a/instances/ee4j.jca/target/config.json +++ b/instances/ee4j.jca/target/config.json @@ -217,7 +217,7 @@ "docker.io/eclipsecbi/jiro-agent-centos-7:latest" ], "context": "centos-7", - "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-centos-7: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 [ \"uid_entrypoint\", \"/usr/local/bin/jenkins-agent\" ]\n\nADD \"https://repo.jenkins-ci.org/public/org/jenkins-ci/main/remoting/3206.3208.v409508a_675ff/remoting-3206.3208.v409508a_675ff.jar\" \"/usr/share/jenkins/agent.jar\" \nADD \"https://github.com/jenkinsci/docker-agent/raw/3206.vb_15dcf73f6a_9-12/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\nUSER 10001:0\n", + "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-centos-7: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/3206.3208.v409508a_675ff/remoting-3206.3208.v409508a_675ff.jar\" \"/usr/share/jenkins/agent.jar\"\nADD \"https://github.com/jenkinsci/docker-agent/raw/3206.vb_15dcf73f6a_9-12/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\nUSER 10001:0\n", "image": "jiro-agent-centos-7", "registry": "docker.io", "repository": "eclipsecbi", @@ -316,7 +316,7 @@ "docker.io/eclipsecbi/jiro-agent-centos-8:latest" ], "context": "centos-8", - "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-centos-8: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 [ \"uid_entrypoint\", \"/usr/local/bin/jenkins-agent\" ]\n\nADD \"https://repo.jenkins-ci.org/public/org/jenkins-ci/main/remoting/3206.3208.v409508a_675ff/remoting-3206.3208.v409508a_675ff.jar\" \"/usr/share/jenkins/agent.jar\" \nADD \"https://github.com/jenkinsci/docker-agent/raw/3206.vb_15dcf73f6a_9-12/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\nUSER 10001:0\n", + "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-centos-8: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/3206.3208.v409508a_675ff/remoting-3206.3208.v409508a_675ff.jar\" \"/usr/share/jenkins/agent.jar\"\nADD \"https://github.com/jenkinsci/docker-agent/raw/3206.vb_15dcf73f6a_9-12/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\nUSER 10001:0\n", "image": "jiro-agent-centos-8", "registry": "docker.io", "repository": "eclipsecbi", @@ -406,6 +406,203 @@ }, "startupScript": "/usr/local/bin/jenkins-agent", "username": "jenkins" + }, + "ubuntu-2204": { + "agentWorkdir": "/home/jenkins/jenkins-agent", + "docker": { + "aliases": [ + "docker.io/eclipsecbi/jiro-agent-ubuntu-2204:latest" + ], + "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-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/3206.3208.v409508a_675ff/remoting-3206.3208.v409508a_675ff.jar\" \"/usr/share/jenkins/agent.jar\"\nADD \"https://github.com/jenkinsci/docker-agent/raw/3206.vb_15dcf73f6a_9-12/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\nUSER 10001:0\n", + "image": "jiro-agent-ubuntu-2204", + "registry": "docker.io", + "repository": "eclipsecbi", + "tag": "remoting-3206.3208.v409508a_675ff" + }, + "env": { + "JAVA_TOOL_OPTIONS": [ ], + "JENKINS_REMOTING_JAVA_OPTS": [ + "-showversion", + "-XshowSettings:vm", + "-Xmx256m", + "-Dorg.jenkinsci.remoting.engine.JnlpProtocol3.disabled=true", + "-Dorg.jenkinsci.plugins.gitclient.CliGitAPIImpl.useSETSID=true" + ], + "OPENJ9_JAVA_OPTIONS": [ + "-XX:+IgnoreUnrecognizedVMOptions", + "-XX:+IdleTuningCompactOnIdle", + "-XX:+IdleTuningGcOnIdle" + ], + "_JAVA_OPTIONS": [ ] + }, + "home": "/home/jenkins", + "kubernetes": { + "inheritYamlMergeStrategy": true, + "resources": { + "cpu": { + "limit": "2000m", + "request": "1000m" + }, + "memory": { + "limit": "4096Mi", + "request": "4096Mi" + } + }, + "volumes": [ + { + "mounts": [ + { + "mountPath": "/home/jenkins/.m2/settings-security.xml", + "subPath": "settings-security.xml" + }, + { + "mountPath": "/home/jenkins/.m2/settings.xml", + "subPath": "settings.xml" + } + ], + "name": "m2-secret-dir", + "secret": { + "name": "m2-secret-dir" + } + }, + { + "configMap": { + "name": "m2-dir" + }, + "mounts": [ + { + "mountPath": "/home/jenkins/.m2/toolchains.xml", + "subPath": "toolchains.xml" + }, + { + "mountPath": "/home/jenkins/.mavenrc", + "subPath": ".mavenrc" + } + ], + "name": "m2-dir" + } + ], + "yamlMergeStrategy": "merge" + }, + "labels": [ + "ubuntu-2204" + ], + "maxHeap": "256m", + "mode": "EXCLUSIVE", + "name": "ubuntu-2204", + "remoting": { + "jar": "/usr/share/jenkins/agent.jar", + "startupScript": { + "name": "jenkins-agent", + "url": "https://github.com/jenkinsci/docker-agent/raw/3206.vb_15dcf73f6a_9-12/jenkins-agent", + "version": "3206.vb_15dcf73f6a_9-12" + }, + "url": "https://repo.jenkins-ci.org/public/org/jenkins-ci/main/remoting/3206.3208.v409508a_675ff/remoting-3206.3208.v409508a_675ff.jar", + "version": "3206.3208.v409508a_675ff" + }, + "startupScript": "/usr/local/bin/jenkins-agent", + "username": "jenkins" + }, + "ubuntu-2404": { + "agentWorkdir": "/home/jenkins/jenkins-agent", + "docker": { + "aliases": [ + "docker.io/eclipsecbi/jiro-agent-ubuntu-2404:latest" + ], + "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-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/3206.3208.v409508a_675ff/remoting-3206.3208.v409508a_675ff.jar\" \"/usr/share/jenkins/agent.jar\"\nADD \"https://github.com/jenkinsci/docker-agent/raw/3206.vb_15dcf73f6a_9-12/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\nUSER 10001:0\n", + "image": "jiro-agent-ubuntu-2404", + "registry": "docker.io", + "repository": "eclipsecbi", + "tag": "remoting-3206.3208.v409508a_675ff" + }, + "env": { + "JAVA_TOOL_OPTIONS": [ ], + "JENKINS_REMOTING_JAVA_OPTS": [ + "-showversion", + "-XshowSettings:vm", + "-Xmx256m", + "-Dorg.jenkinsci.remoting.engine.JnlpProtocol3.disabled=true", + "-Dorg.jenkinsci.plugins.gitclient.CliGitAPIImpl.useSETSID=true" + ], + "OPENJ9_JAVA_OPTIONS": [ + "-XX:+IgnoreUnrecognizedVMOptions", + "-XX:+IdleTuningCompactOnIdle", + "-XX:+IdleTuningGcOnIdle" + ], + "_JAVA_OPTIONS": [ ] + }, + "home": "/home/jenkins", + "kubernetes": { + "inheritYamlMergeStrategy": true, + "resources": { + "cpu": { + "limit": "2000m", + "request": "1000m" + }, + "memory": { + "limit": "4096Mi", + "request": "4096Mi" + } + }, + "volumes": [ + { + "mounts": [ + { + "mountPath": "/home/jenkins/.m2/settings-security.xml", + "subPath": "settings-security.xml" + }, + { + "mountPath": "/home/jenkins/.m2/settings.xml", + "subPath": "settings.xml" + } + ], + "name": "m2-secret-dir", + "secret": { + "name": "m2-secret-dir" + } + }, + { + "configMap": { + "name": "m2-dir" + }, + "mounts": [ + { + "mountPath": "/home/jenkins/.m2/toolchains.xml", + "subPath": "toolchains.xml" + }, + { + "mountPath": "/home/jenkins/.mavenrc", + "subPath": ".mavenrc" + } + ], + "name": "m2-dir" + } + ], + "yamlMergeStrategy": "merge" + }, + "labels": [ + "ubuntu-latest", + "ubuntu-2404" + ], + "maxHeap": "256m", + "mode": "EXCLUSIVE", + "name": "ubuntu-2404", + "remoting": { + "jar": "/usr/share/jenkins/agent.jar", + "startupScript": { + "name": "jenkins-agent", + "url": "https://github.com/jenkinsci/docker-agent/raw/3206.vb_15dcf73f6a_9-12/jenkins-agent", + "version": "3206.vb_15dcf73f6a_9-12" + }, + "url": "https://repo.jenkins-ci.org/public/org/jenkins-ci/main/remoting/3206.3208.v409508a_675ff/remoting-3206.3208.v409508a_675ff.jar", + "version": "3206.3208.v409508a_675ff" + }, + "startupScript": "/usr/local/bin/jenkins-agent", + "username": "jenkins" } } } @@ -754,6 +951,7 @@ }, "generate": false }, + "seLinuxLevel": "s0:c43,c32", "secrets": { "dockerconfigjson": { "dockerconfigjson-for-pull-as-default": { diff --git a/instances/ee4j.jca/target/jenkins/configuration.yml b/instances/ee4j.jca/target/jenkins/configuration.yml index 48ab6a627..a1887e0a2 100644 --- a/instances/ee4j.jca/target/jenkins/configuration.yml +++ b/instances/ee4j.jca/target/jenkins/configuration.yml @@ -485,6 +485,188 @@ jenkins: name: m2-dir inheritYamlMergeStrategy: "true" yamlMergeStrategy: "merge" + - name: "ubuntu-2204" + namespace: "jca" + label: "ubuntu-2204" + containers: + - name: "jnlp" + image: docker.io/eclipsecbi/jiro-agent-ubuntu-2204:remoting-3206.3208.v409508a_675ff + alwaysPullImage: true + livenessProbe: + failureThreshold: 0 + initialDelaySeconds: 0 + periodSeconds: 0 + successThreshold: 0 + timeoutSeconds: 0 + ttyEnabled: true + command: "" + args: "" + instanceCap: -1 + nodeUsageMode: EXCLUSIVE + envVars: + - envVar: + key: "JAVA_TOOL_OPTIONS" + 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" + - envVar: + key: "OPENJ9_JAVA_OPTIONS" + value: "-XX:+IgnoreUnrecognizedVMOptions -XX:+IdleTuningCompactOnIdle -XX:+IdleTuningGcOnIdle" + - envVar: + key: "_JAVA_OPTIONS" + value: "" + volumes: + - persistentVolumeClaim: + claimName: "tools-claim-jiro-jca" + mountPath: "/opt/tools" + readOnly: true + - configMapVolume: + configMapName: "known-hosts" + mountPath: "/home/jenkins/.ssh/" + subPath: "." + - emptyDirVolume: + memory: false + mountPath: "/home/jenkins/" + - emptyDirVolume: + memory: false + mountPath: "/home/jenkins/.m2/repository" + - emptyDirVolume: + memory: false + mountPath: "/home/jenkins/.m2/wrapper" + workspaceVolume: + emptyDirWorkspaceVolume: + memory: false + yaml: | + apiVersion: v1 + kind: Pod + spec: + containers: + - name: jnlp + resources: + limits: + cpu: "2000m" + memory: "4096Mi" + requests: + cpu: "1000m" + memory: "4096Mi" + volumeMounts: + - name: m2-secret-dir + mountPath: /home/jenkins/.m2/settings-security.xml + subPath: settings-security.xml + readOnly: true + - name: m2-secret-dir + mountPath: /home/jenkins/.m2/settings.xml + subPath: settings.xml + readOnly: true + - name: m2-dir + mountPath: /home/jenkins/.m2/toolchains.xml + subPath: toolchains.xml + readOnly: true + - name: m2-dir + mountPath: /home/jenkins/.mavenrc + subPath: .mavenrc + readOnly: true + volumes: + - name: m2-secret-dir + secret: + secretName: m2-secret-dir + - name: m2-dir + configMap: + name: m2-dir + inheritYamlMergeStrategy: "true" + yamlMergeStrategy: "merge" + - name: "ubuntu-2404" + namespace: "jca" + label: "ubuntu-latest ubuntu-2404" + containers: + - name: "jnlp" + image: docker.io/eclipsecbi/jiro-agent-ubuntu-2404:remoting-3206.3208.v409508a_675ff + alwaysPullImage: true + livenessProbe: + failureThreshold: 0 + initialDelaySeconds: 0 + periodSeconds: 0 + successThreshold: 0 + timeoutSeconds: 0 + ttyEnabled: true + command: "" + args: "" + instanceCap: -1 + nodeUsageMode: EXCLUSIVE + envVars: + - envVar: + key: "JAVA_TOOL_OPTIONS" + 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" + - envVar: + key: "OPENJ9_JAVA_OPTIONS" + value: "-XX:+IgnoreUnrecognizedVMOptions -XX:+IdleTuningCompactOnIdle -XX:+IdleTuningGcOnIdle" + - envVar: + key: "_JAVA_OPTIONS" + value: "" + volumes: + - persistentVolumeClaim: + claimName: "tools-claim-jiro-jca" + mountPath: "/opt/tools" + readOnly: true + - configMapVolume: + configMapName: "known-hosts" + mountPath: "/home/jenkins/.ssh/" + subPath: "." + - emptyDirVolume: + memory: false + mountPath: "/home/jenkins/" + - emptyDirVolume: + memory: false + mountPath: "/home/jenkins/.m2/repository" + - emptyDirVolume: + memory: false + mountPath: "/home/jenkins/.m2/wrapper" + workspaceVolume: + emptyDirWorkspaceVolume: + memory: false + yaml: | + apiVersion: v1 + kind: Pod + spec: + containers: + - name: jnlp + resources: + limits: + cpu: "2000m" + memory: "4096Mi" + requests: + cpu: "1000m" + memory: "4096Mi" + volumeMounts: + - name: m2-secret-dir + mountPath: /home/jenkins/.m2/settings-security.xml + subPath: settings-security.xml + readOnly: true + - name: m2-secret-dir + mountPath: /home/jenkins/.m2/settings.xml + subPath: settings.xml + readOnly: true + - name: m2-dir + mountPath: /home/jenkins/.m2/toolchains.xml + subPath: toolchains.xml + readOnly: true + - name: m2-dir + mountPath: /home/jenkins/.mavenrc + subPath: .mavenrc + readOnly: true + volumes: + - name: m2-secret-dir + secret: + secretName: m2-secret-dir + - name: m2-dir + configMap: + name: m2-dir + inheritYamlMergeStrategy: "true" + yamlMergeStrategy: "merge" security: apiToken: creationOfLegacyTokenEnabled: false @@ -579,6 +761,8 @@ tool: home: "/opt/tools/java/openjdk/latest" - name: "openjdk-ea-latest" home: "/opt/tools/java/openjdk/ea-latest" + - name: "openjdk-jdk24-latest" + home: "/opt/tools/java/openjdk/jdk-24/latest" - name: "openjdk-jdk23-latest" home: "/opt/tools/java/openjdk/jdk-23/latest" - name: "openjdk-jdk22-latest" @@ -708,6 +892,8 @@ tool: installations: - name: "apache-maven-latest" home: "/opt/tools/apache-maven/latest" + - name: "apache-maven-3.9.9" + home: "/opt/tools/apache-maven/3.9.9" - name: "apache-maven-3.9.6" home: "/opt/tools/apache-maven/3.9.6" - name: "apache-maven-3.9.5" diff --git a/instances/ee4j.jca/target/k8s/configmap-jenkins-config.yml b/instances/ee4j.jca/target/k8s/configmap-jenkins-config.yml index 22e457aa2..6e081bfb1 100644 --- a/instances/ee4j.jca/target/k8s/configmap-jenkins-config.yml +++ b/instances/ee4j.jca/target/k8s/configmap-jenkins-config.yml @@ -508,6 +508,188 @@ data: name: m2-dir inheritYamlMergeStrategy: "true" yamlMergeStrategy: "merge" + - name: "ubuntu-2204" + namespace: "jca" + label: "ubuntu-2204" + containers: + - name: "jnlp" + image: docker.io/eclipsecbi/jiro-agent-ubuntu-2204:remoting-3206.3208.v409508a_675ff + alwaysPullImage: true + livenessProbe: + failureThreshold: 0 + initialDelaySeconds: 0 + periodSeconds: 0 + successThreshold: 0 + timeoutSeconds: 0 + ttyEnabled: true + command: "" + args: "" + instanceCap: -1 + nodeUsageMode: EXCLUSIVE + envVars: + - envVar: + key: "JAVA_TOOL_OPTIONS" + 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" + - envVar: + key: "OPENJ9_JAVA_OPTIONS" + value: "-XX:+IgnoreUnrecognizedVMOptions -XX:+IdleTuningCompactOnIdle -XX:+IdleTuningGcOnIdle" + - envVar: + key: "_JAVA_OPTIONS" + value: "" + volumes: + - persistentVolumeClaim: + claimName: "tools-claim-jiro-jca" + mountPath: "/opt/tools" + readOnly: true + - configMapVolume: + configMapName: "known-hosts" + mountPath: "/home/jenkins/.ssh/" + subPath: "." + - emptyDirVolume: + memory: false + mountPath: "/home/jenkins/" + - emptyDirVolume: + memory: false + mountPath: "/home/jenkins/.m2/repository" + - emptyDirVolume: + memory: false + mountPath: "/home/jenkins/.m2/wrapper" + workspaceVolume: + emptyDirWorkspaceVolume: + memory: false + yaml: | + apiVersion: v1 + kind: Pod + spec: + containers: + - name: jnlp + resources: + limits: + cpu: "2000m" + memory: "4096Mi" + requests: + cpu: "1000m" + memory: "4096Mi" + volumeMounts: + - name: m2-secret-dir + mountPath: /home/jenkins/.m2/settings-security.xml + subPath: settings-security.xml + readOnly: true + - name: m2-secret-dir + mountPath: /home/jenkins/.m2/settings.xml + subPath: settings.xml + readOnly: true + - name: m2-dir + mountPath: /home/jenkins/.m2/toolchains.xml + subPath: toolchains.xml + readOnly: true + - name: m2-dir + mountPath: /home/jenkins/.mavenrc + subPath: .mavenrc + readOnly: true + volumes: + - name: m2-secret-dir + secret: + secretName: m2-secret-dir + - name: m2-dir + configMap: + name: m2-dir + inheritYamlMergeStrategy: "true" + yamlMergeStrategy: "merge" + - name: "ubuntu-2404" + namespace: "jca" + label: "ubuntu-latest ubuntu-2404" + containers: + - name: "jnlp" + image: docker.io/eclipsecbi/jiro-agent-ubuntu-2404:remoting-3206.3208.v409508a_675ff + alwaysPullImage: true + livenessProbe: + failureThreshold: 0 + initialDelaySeconds: 0 + periodSeconds: 0 + successThreshold: 0 + timeoutSeconds: 0 + ttyEnabled: true + command: "" + args: "" + instanceCap: -1 + nodeUsageMode: EXCLUSIVE + envVars: + - envVar: + key: "JAVA_TOOL_OPTIONS" + 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" + - envVar: + key: "OPENJ9_JAVA_OPTIONS" + value: "-XX:+IgnoreUnrecognizedVMOptions -XX:+IdleTuningCompactOnIdle -XX:+IdleTuningGcOnIdle" + - envVar: + key: "_JAVA_OPTIONS" + value: "" + volumes: + - persistentVolumeClaim: + claimName: "tools-claim-jiro-jca" + mountPath: "/opt/tools" + readOnly: true + - configMapVolume: + configMapName: "known-hosts" + mountPath: "/home/jenkins/.ssh/" + subPath: "." + - emptyDirVolume: + memory: false + mountPath: "/home/jenkins/" + - emptyDirVolume: + memory: false + mountPath: "/home/jenkins/.m2/repository" + - emptyDirVolume: + memory: false + mountPath: "/home/jenkins/.m2/wrapper" + workspaceVolume: + emptyDirWorkspaceVolume: + memory: false + yaml: | + apiVersion: v1 + kind: Pod + spec: + containers: + - name: jnlp + resources: + limits: + cpu: "2000m" + memory: "4096Mi" + requests: + cpu: "1000m" + memory: "4096Mi" + volumeMounts: + - name: m2-secret-dir + mountPath: /home/jenkins/.m2/settings-security.xml + subPath: settings-security.xml + readOnly: true + - name: m2-secret-dir + mountPath: /home/jenkins/.m2/settings.xml + subPath: settings.xml + readOnly: true + - name: m2-dir + mountPath: /home/jenkins/.m2/toolchains.xml + subPath: toolchains.xml + readOnly: true + - name: m2-dir + mountPath: /home/jenkins/.mavenrc + subPath: .mavenrc + readOnly: true + volumes: + - name: m2-secret-dir + secret: + secretName: m2-secret-dir + - name: m2-dir + configMap: + name: m2-dir + inheritYamlMergeStrategy: "true" + yamlMergeStrategy: "merge" security: apiToken: creationOfLegacyTokenEnabled: false @@ -602,6 +784,8 @@ data: home: "/opt/tools/java/openjdk/latest" - name: "openjdk-ea-latest" home: "/opt/tools/java/openjdk/ea-latest" + - name: "openjdk-jdk24-latest" + home: "/opt/tools/java/openjdk/jdk-24/latest" - name: "openjdk-jdk23-latest" home: "/opt/tools/java/openjdk/jdk-23/latest" - name: "openjdk-jdk22-latest" @@ -731,6 +915,8 @@ data: installations: - name: "apache-maven-latest" home: "/opt/tools/apache-maven/latest" + - name: "apache-maven-3.9.9" + home: "/opt/tools/apache-maven/3.9.9" - name: "apache-maven-3.9.6" home: "/opt/tools/apache-maven/3.9.6" - name: "apache-maven-3.9.5" diff --git a/instances/ee4j.jca/target/k8s/m2-dir.json b/instances/ee4j.jca/target/k8s/m2-dir.json index 177dcd89c..ddcf81e8b 100644 --- a/instances/ee4j.jca/target/k8s/m2-dir.json +++ b/instances/ee4j.jca/target/k8s/m2-dir.json @@ -2,7 +2,7 @@ "apiVersion": "v1", "data": { ".mavenrc": "set -- -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn --batch-mode \"${@}\"", - "toolchains.xml": "\n\n \n jdk\n \n JavaSE-1.8\n 1.8\n oracle\n \n /opt/tools/java/oracle/jdk-8/latest\n \n \n jdk\n \n JavaSE-9\n 9\n openjdk\n \n /opt/tools/java/openjdk/jdk-9/latest\n \n \n jdk\n \n JavaSE-10\n 10\n openjdk\n \n /opt/tools/java/openjdk/jdk-10/latest\n \n \n jdk\n \n JavaSE-11\n 11\n openjdk\n \n /opt/tools/java/openjdk/jdk-11/latest\n \n \n jdk\n \n JavaSE-12\n 12\n openjdk\n \n /opt/tools/java/openjdk/jdk-12/latest\n \n \n jdk\n \n JavaSE-13\n 13\n openjdk\n \n /opt/tools/java/openjdk/jdk-13/latest\n \n \n jdk\n \n JavaSE-14\n 14\n openjdk\n \n /opt/tools/java/openjdk/jdk-14/latest\n \n \n jdk\n \n JavaSE-15\n 15\n openjdk\n \n /opt/tools/java/openjdk/jdk-15/latest\n \n \n jdk\n \n JavaSE-16\n 16\n openjdk\n \n /opt/tools/java/openjdk/jdk-16/latest\n \n \n jdk\n \n JavaSE-17\n 17\n openjdk\n \n /opt/tools/java/openjdk/jdk-17/latest\n \n \n jdk\n \n JavaSE-18\n 18\n openjdk\n \n /opt/tools/java/openjdk/jdk-18/latest\n \n \n jdk\n \n JavaSE-19\n 19\n openjdk\n \n /opt/tools/java/openjdk/jdk-19/latest\n \n \n jdk\n \n JavaSE-20\n 20\n openjdk\n \n /opt/tools/java/openjdk/jdk-20/latest\n \n \n jdk\n \n JavaSE-21\n 21\n openjdk\n \n /opt/tools/java/openjdk/jdk-21/latest\n \n \n jdk\n \n JavaSE-22\n 22\n openjdk\n \n /opt/tools/java/openjdk/jdk-22/latest\n \n \n jdk\n \n JavaSE-23\n 23\n openjdk\n \n /opt/tools/java/openjdk/jdk-23/latest\n \n\n" + "toolchains.xml": "\n\n \n jdk\n \n JavaSE-1.8\n 1.8\n oracle\n \n /opt/tools/java/oracle/jdk-8/latest\n \n \n jdk\n \n JavaSE-9\n 9\n openjdk\n \n /opt/tools/java/openjdk/jdk-9/latest\n \n \n jdk\n \n JavaSE-10\n 10\n openjdk\n \n /opt/tools/java/openjdk/jdk-10/latest\n \n \n jdk\n \n JavaSE-11\n 11\n openjdk\n \n /opt/tools/java/openjdk/jdk-11/latest\n \n \n jdk\n \n JavaSE-12\n 12\n openjdk\n \n /opt/tools/java/openjdk/jdk-12/latest\n \n \n jdk\n \n JavaSE-13\n 13\n openjdk\n \n /opt/tools/java/openjdk/jdk-13/latest\n \n \n jdk\n \n JavaSE-14\n 14\n openjdk\n \n /opt/tools/java/openjdk/jdk-14/latest\n \n \n jdk\n \n JavaSE-15\n 15\n openjdk\n \n /opt/tools/java/openjdk/jdk-15/latest\n \n \n jdk\n \n JavaSE-16\n 16\n openjdk\n \n /opt/tools/java/openjdk/jdk-16/latest\n \n \n jdk\n \n JavaSE-17\n 17\n openjdk\n \n /opt/tools/java/openjdk/jdk-17/latest\n \n \n jdk\n \n JavaSE-18\n 18\n openjdk\n \n /opt/tools/java/openjdk/jdk-18/latest\n \n \n jdk\n \n JavaSE-19\n 19\n openjdk\n \n /opt/tools/java/openjdk/jdk-19/latest\n \n \n jdk\n \n JavaSE-20\n 20\n openjdk\n \n /opt/tools/java/openjdk/jdk-20/latest\n \n \n jdk\n \n JavaSE-21\n 21\n openjdk\n \n /opt/tools/java/openjdk/jdk-21/latest\n \n \n jdk\n \n JavaSE-22\n 22\n openjdk\n \n /opt/tools/java/openjdk/jdk-22/latest\n \n \n jdk\n \n JavaSE-23\n 23\n openjdk\n \n /opt/tools/java/openjdk/jdk-23/latest\n \n \n jdk\n \n JavaSE-24\n 24\n openjdk\n \n /opt/tools/java/openjdk/jdk-24/latest\n \n\n" }, "kind": "ConfigMap", "metadata": { diff --git a/instances/ee4j.jca/target/k8s/statefulset.json b/instances/ee4j.jca/target/k8s/statefulset.json index ca4ca58a0..07b075d74 100644 --- a/instances/ee4j.jca/target/k8s/statefulset.json +++ b/instances/ee4j.jca/target/k8s/statefulset.json @@ -119,6 +119,12 @@ "cpu": "250m" } }, + "securityContext": { + "seLinuxOptions": { + "level": "s0:c43,c32", + "type": "spc_t" + } + }, "volumeMounts": [ { "mountPath": "/var/jenkins", diff --git a/instances/ee4j.jpa/config.jsonnet b/instances/ee4j.jpa/config.jsonnet index c31e50d97..09f6c4dbd 100644 --- a/instances/ee4j.jpa/config.jsonnet +++ b/instances/ee4j.jpa/config.jsonnet @@ -8,4 +8,5 @@ "copyartifact", ], }, + seLinuxLevel: "s0:c44,c29", } diff --git a/instances/ee4j.jpa/target/config.json b/instances/ee4j.jpa/target/config.json index e2d32fb1d..6ca9a1dba 100644 --- a/instances/ee4j.jpa/target/config.json +++ b/instances/ee4j.jpa/target/config.json @@ -217,7 +217,7 @@ "docker.io/eclipsecbi/jiro-agent-centos-7:latest" ], "context": "centos-7", - "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-centos-7: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 [ \"uid_entrypoint\", \"/usr/local/bin/jenkins-agent\" ]\n\nADD \"https://repo.jenkins-ci.org/public/org/jenkins-ci/main/remoting/3206.3208.v409508a_675ff/remoting-3206.3208.v409508a_675ff.jar\" \"/usr/share/jenkins/agent.jar\" \nADD \"https://github.com/jenkinsci/docker-agent/raw/3206.vb_15dcf73f6a_9-12/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\nUSER 10001:0\n", + "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-centos-7: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/3206.3208.v409508a_675ff/remoting-3206.3208.v409508a_675ff.jar\" \"/usr/share/jenkins/agent.jar\"\nADD \"https://github.com/jenkinsci/docker-agent/raw/3206.vb_15dcf73f6a_9-12/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\nUSER 10001:0\n", "image": "jiro-agent-centos-7", "registry": "docker.io", "repository": "eclipsecbi", @@ -316,7 +316,7 @@ "docker.io/eclipsecbi/jiro-agent-centos-8:latest" ], "context": "centos-8", - "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-centos-8: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 [ \"uid_entrypoint\", \"/usr/local/bin/jenkins-agent\" ]\n\nADD \"https://repo.jenkins-ci.org/public/org/jenkins-ci/main/remoting/3206.3208.v409508a_675ff/remoting-3206.3208.v409508a_675ff.jar\" \"/usr/share/jenkins/agent.jar\" \nADD \"https://github.com/jenkinsci/docker-agent/raw/3206.vb_15dcf73f6a_9-12/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\nUSER 10001:0\n", + "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-centos-8: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/3206.3208.v409508a_675ff/remoting-3206.3208.v409508a_675ff.jar\" \"/usr/share/jenkins/agent.jar\"\nADD \"https://github.com/jenkinsci/docker-agent/raw/3206.vb_15dcf73f6a_9-12/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\nUSER 10001:0\n", "image": "jiro-agent-centos-8", "registry": "docker.io", "repository": "eclipsecbi", @@ -406,6 +406,203 @@ }, "startupScript": "/usr/local/bin/jenkins-agent", "username": "jenkins" + }, + "ubuntu-2204": { + "agentWorkdir": "/home/jenkins/jenkins-agent", + "docker": { + "aliases": [ + "docker.io/eclipsecbi/jiro-agent-ubuntu-2204:latest" + ], + "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-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/3206.3208.v409508a_675ff/remoting-3206.3208.v409508a_675ff.jar\" \"/usr/share/jenkins/agent.jar\"\nADD \"https://github.com/jenkinsci/docker-agent/raw/3206.vb_15dcf73f6a_9-12/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\nUSER 10001:0\n", + "image": "jiro-agent-ubuntu-2204", + "registry": "docker.io", + "repository": "eclipsecbi", + "tag": "remoting-3206.3208.v409508a_675ff" + }, + "env": { + "JAVA_TOOL_OPTIONS": [ ], + "JENKINS_REMOTING_JAVA_OPTS": [ + "-showversion", + "-XshowSettings:vm", + "-Xmx256m", + "-Dorg.jenkinsci.remoting.engine.JnlpProtocol3.disabled=true", + "-Dorg.jenkinsci.plugins.gitclient.CliGitAPIImpl.useSETSID=true" + ], + "OPENJ9_JAVA_OPTIONS": [ + "-XX:+IgnoreUnrecognizedVMOptions", + "-XX:+IdleTuningCompactOnIdle", + "-XX:+IdleTuningGcOnIdle" + ], + "_JAVA_OPTIONS": [ ] + }, + "home": "/home/jenkins", + "kubernetes": { + "inheritYamlMergeStrategy": true, + "resources": { + "cpu": { + "limit": "2000m", + "request": "1000m" + }, + "memory": { + "limit": "4096Mi", + "request": "4096Mi" + } + }, + "volumes": [ + { + "mounts": [ + { + "mountPath": "/home/jenkins/.m2/settings-security.xml", + "subPath": "settings-security.xml" + }, + { + "mountPath": "/home/jenkins/.m2/settings.xml", + "subPath": "settings.xml" + } + ], + "name": "m2-secret-dir", + "secret": { + "name": "m2-secret-dir" + } + }, + { + "configMap": { + "name": "m2-dir" + }, + "mounts": [ + { + "mountPath": "/home/jenkins/.m2/toolchains.xml", + "subPath": "toolchains.xml" + }, + { + "mountPath": "/home/jenkins/.mavenrc", + "subPath": ".mavenrc" + } + ], + "name": "m2-dir" + } + ], + "yamlMergeStrategy": "merge" + }, + "labels": [ + "ubuntu-2204" + ], + "maxHeap": "256m", + "mode": "EXCLUSIVE", + "name": "ubuntu-2204", + "remoting": { + "jar": "/usr/share/jenkins/agent.jar", + "startupScript": { + "name": "jenkins-agent", + "url": "https://github.com/jenkinsci/docker-agent/raw/3206.vb_15dcf73f6a_9-12/jenkins-agent", + "version": "3206.vb_15dcf73f6a_9-12" + }, + "url": "https://repo.jenkins-ci.org/public/org/jenkins-ci/main/remoting/3206.3208.v409508a_675ff/remoting-3206.3208.v409508a_675ff.jar", + "version": "3206.3208.v409508a_675ff" + }, + "startupScript": "/usr/local/bin/jenkins-agent", + "username": "jenkins" + }, + "ubuntu-2404": { + "agentWorkdir": "/home/jenkins/jenkins-agent", + "docker": { + "aliases": [ + "docker.io/eclipsecbi/jiro-agent-ubuntu-2404:latest" + ], + "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-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/3206.3208.v409508a_675ff/remoting-3206.3208.v409508a_675ff.jar\" \"/usr/share/jenkins/agent.jar\"\nADD \"https://github.com/jenkinsci/docker-agent/raw/3206.vb_15dcf73f6a_9-12/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\nUSER 10001:0\n", + "image": "jiro-agent-ubuntu-2404", + "registry": "docker.io", + "repository": "eclipsecbi", + "tag": "remoting-3206.3208.v409508a_675ff" + }, + "env": { + "JAVA_TOOL_OPTIONS": [ ], + "JENKINS_REMOTING_JAVA_OPTS": [ + "-showversion", + "-XshowSettings:vm", + "-Xmx256m", + "-Dorg.jenkinsci.remoting.engine.JnlpProtocol3.disabled=true", + "-Dorg.jenkinsci.plugins.gitclient.CliGitAPIImpl.useSETSID=true" + ], + "OPENJ9_JAVA_OPTIONS": [ + "-XX:+IgnoreUnrecognizedVMOptions", + "-XX:+IdleTuningCompactOnIdle", + "-XX:+IdleTuningGcOnIdle" + ], + "_JAVA_OPTIONS": [ ] + }, + "home": "/home/jenkins", + "kubernetes": { + "inheritYamlMergeStrategy": true, + "resources": { + "cpu": { + "limit": "2000m", + "request": "1000m" + }, + "memory": { + "limit": "4096Mi", + "request": "4096Mi" + } + }, + "volumes": [ + { + "mounts": [ + { + "mountPath": "/home/jenkins/.m2/settings-security.xml", + "subPath": "settings-security.xml" + }, + { + "mountPath": "/home/jenkins/.m2/settings.xml", + "subPath": "settings.xml" + } + ], + "name": "m2-secret-dir", + "secret": { + "name": "m2-secret-dir" + } + }, + { + "configMap": { + "name": "m2-dir" + }, + "mounts": [ + { + "mountPath": "/home/jenkins/.m2/toolchains.xml", + "subPath": "toolchains.xml" + }, + { + "mountPath": "/home/jenkins/.mavenrc", + "subPath": ".mavenrc" + } + ], + "name": "m2-dir" + } + ], + "yamlMergeStrategy": "merge" + }, + "labels": [ + "ubuntu-latest", + "ubuntu-2404" + ], + "maxHeap": "256m", + "mode": "EXCLUSIVE", + "name": "ubuntu-2404", + "remoting": { + "jar": "/usr/share/jenkins/agent.jar", + "startupScript": { + "name": "jenkins-agent", + "url": "https://github.com/jenkinsci/docker-agent/raw/3206.vb_15dcf73f6a_9-12/jenkins-agent", + "version": "3206.vb_15dcf73f6a_9-12" + }, + "url": "https://repo.jenkins-ci.org/public/org/jenkins-ci/main/remoting/3206.3208.v409508a_675ff/remoting-3206.3208.v409508a_675ff.jar", + "version": "3206.3208.v409508a_675ff" + }, + "startupScript": "/usr/local/bin/jenkins-agent", + "username": "jenkins" } } } @@ -754,6 +951,7 @@ }, "generate": false }, + "seLinuxLevel": "s0:c44,c29", "secrets": { "dockerconfigjson": { "dockerconfigjson-for-pull-as-default": { diff --git a/instances/ee4j.jpa/target/jenkins/configuration.yml b/instances/ee4j.jpa/target/jenkins/configuration.yml index f078cba0c..c101735a8 100644 --- a/instances/ee4j.jpa/target/jenkins/configuration.yml +++ b/instances/ee4j.jpa/target/jenkins/configuration.yml @@ -485,6 +485,188 @@ jenkins: name: m2-dir inheritYamlMergeStrategy: "true" yamlMergeStrategy: "merge" + - name: "ubuntu-2204" + namespace: "jpa" + label: "ubuntu-2204" + containers: + - name: "jnlp" + image: docker.io/eclipsecbi/jiro-agent-ubuntu-2204:remoting-3206.3208.v409508a_675ff + alwaysPullImage: true + livenessProbe: + failureThreshold: 0 + initialDelaySeconds: 0 + periodSeconds: 0 + successThreshold: 0 + timeoutSeconds: 0 + ttyEnabled: true + command: "" + args: "" + instanceCap: -1 + nodeUsageMode: EXCLUSIVE + envVars: + - envVar: + key: "JAVA_TOOL_OPTIONS" + 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" + - envVar: + key: "OPENJ9_JAVA_OPTIONS" + value: "-XX:+IgnoreUnrecognizedVMOptions -XX:+IdleTuningCompactOnIdle -XX:+IdleTuningGcOnIdle" + - envVar: + key: "_JAVA_OPTIONS" + value: "" + volumes: + - persistentVolumeClaim: + claimName: "tools-claim-jiro-jpa" + mountPath: "/opt/tools" + readOnly: true + - configMapVolume: + configMapName: "known-hosts" + mountPath: "/home/jenkins/.ssh/" + subPath: "." + - emptyDirVolume: + memory: false + mountPath: "/home/jenkins/" + - emptyDirVolume: + memory: false + mountPath: "/home/jenkins/.m2/repository" + - emptyDirVolume: + memory: false + mountPath: "/home/jenkins/.m2/wrapper" + workspaceVolume: + emptyDirWorkspaceVolume: + memory: false + yaml: | + apiVersion: v1 + kind: Pod + spec: + containers: + - name: jnlp + resources: + limits: + cpu: "2000m" + memory: "4096Mi" + requests: + cpu: "1000m" + memory: "4096Mi" + volumeMounts: + - name: m2-secret-dir + mountPath: /home/jenkins/.m2/settings-security.xml + subPath: settings-security.xml + readOnly: true + - name: m2-secret-dir + mountPath: /home/jenkins/.m2/settings.xml + subPath: settings.xml + readOnly: true + - name: m2-dir + mountPath: /home/jenkins/.m2/toolchains.xml + subPath: toolchains.xml + readOnly: true + - name: m2-dir + mountPath: /home/jenkins/.mavenrc + subPath: .mavenrc + readOnly: true + volumes: + - name: m2-secret-dir + secret: + secretName: m2-secret-dir + - name: m2-dir + configMap: + name: m2-dir + inheritYamlMergeStrategy: "true" + yamlMergeStrategy: "merge" + - name: "ubuntu-2404" + namespace: "jpa" + label: "ubuntu-latest ubuntu-2404" + containers: + - name: "jnlp" + image: docker.io/eclipsecbi/jiro-agent-ubuntu-2404:remoting-3206.3208.v409508a_675ff + alwaysPullImage: true + livenessProbe: + failureThreshold: 0 + initialDelaySeconds: 0 + periodSeconds: 0 + successThreshold: 0 + timeoutSeconds: 0 + ttyEnabled: true + command: "" + args: "" + instanceCap: -1 + nodeUsageMode: EXCLUSIVE + envVars: + - envVar: + key: "JAVA_TOOL_OPTIONS" + 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" + - envVar: + key: "OPENJ9_JAVA_OPTIONS" + value: "-XX:+IgnoreUnrecognizedVMOptions -XX:+IdleTuningCompactOnIdle -XX:+IdleTuningGcOnIdle" + - envVar: + key: "_JAVA_OPTIONS" + value: "" + volumes: + - persistentVolumeClaim: + claimName: "tools-claim-jiro-jpa" + mountPath: "/opt/tools" + readOnly: true + - configMapVolume: + configMapName: "known-hosts" + mountPath: "/home/jenkins/.ssh/" + subPath: "." + - emptyDirVolume: + memory: false + mountPath: "/home/jenkins/" + - emptyDirVolume: + memory: false + mountPath: "/home/jenkins/.m2/repository" + - emptyDirVolume: + memory: false + mountPath: "/home/jenkins/.m2/wrapper" + workspaceVolume: + emptyDirWorkspaceVolume: + memory: false + yaml: | + apiVersion: v1 + kind: Pod + spec: + containers: + - name: jnlp + resources: + limits: + cpu: "2000m" + memory: "4096Mi" + requests: + cpu: "1000m" + memory: "4096Mi" + volumeMounts: + - name: m2-secret-dir + mountPath: /home/jenkins/.m2/settings-security.xml + subPath: settings-security.xml + readOnly: true + - name: m2-secret-dir + mountPath: /home/jenkins/.m2/settings.xml + subPath: settings.xml + readOnly: true + - name: m2-dir + mountPath: /home/jenkins/.m2/toolchains.xml + subPath: toolchains.xml + readOnly: true + - name: m2-dir + mountPath: /home/jenkins/.mavenrc + subPath: .mavenrc + readOnly: true + volumes: + - name: m2-secret-dir + secret: + secretName: m2-secret-dir + - name: m2-dir + configMap: + name: m2-dir + inheritYamlMergeStrategy: "true" + yamlMergeStrategy: "merge" security: apiToken: creationOfLegacyTokenEnabled: false @@ -579,6 +761,8 @@ tool: home: "/opt/tools/java/openjdk/latest" - name: "openjdk-ea-latest" home: "/opt/tools/java/openjdk/ea-latest" + - name: "openjdk-jdk24-latest" + home: "/opt/tools/java/openjdk/jdk-24/latest" - name: "openjdk-jdk23-latest" home: "/opt/tools/java/openjdk/jdk-23/latest" - name: "openjdk-jdk22-latest" @@ -708,6 +892,8 @@ tool: installations: - name: "apache-maven-latest" home: "/opt/tools/apache-maven/latest" + - name: "apache-maven-3.9.9" + home: "/opt/tools/apache-maven/3.9.9" - name: "apache-maven-3.9.6" home: "/opt/tools/apache-maven/3.9.6" - name: "apache-maven-3.9.5" diff --git a/instances/ee4j.jpa/target/k8s/configmap-jenkins-config.yml b/instances/ee4j.jpa/target/k8s/configmap-jenkins-config.yml index 22d2d78ab..36000ad77 100644 --- a/instances/ee4j.jpa/target/k8s/configmap-jenkins-config.yml +++ b/instances/ee4j.jpa/target/k8s/configmap-jenkins-config.yml @@ -508,6 +508,188 @@ data: name: m2-dir inheritYamlMergeStrategy: "true" yamlMergeStrategy: "merge" + - name: "ubuntu-2204" + namespace: "jpa" + label: "ubuntu-2204" + containers: + - name: "jnlp" + image: docker.io/eclipsecbi/jiro-agent-ubuntu-2204:remoting-3206.3208.v409508a_675ff + alwaysPullImage: true + livenessProbe: + failureThreshold: 0 + initialDelaySeconds: 0 + periodSeconds: 0 + successThreshold: 0 + timeoutSeconds: 0 + ttyEnabled: true + command: "" + args: "" + instanceCap: -1 + nodeUsageMode: EXCLUSIVE + envVars: + - envVar: + key: "JAVA_TOOL_OPTIONS" + 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" + - envVar: + key: "OPENJ9_JAVA_OPTIONS" + value: "-XX:+IgnoreUnrecognizedVMOptions -XX:+IdleTuningCompactOnIdle -XX:+IdleTuningGcOnIdle" + - envVar: + key: "_JAVA_OPTIONS" + value: "" + volumes: + - persistentVolumeClaim: + claimName: "tools-claim-jiro-jpa" + mountPath: "/opt/tools" + readOnly: true + - configMapVolume: + configMapName: "known-hosts" + mountPath: "/home/jenkins/.ssh/" + subPath: "." + - emptyDirVolume: + memory: false + mountPath: "/home/jenkins/" + - emptyDirVolume: + memory: false + mountPath: "/home/jenkins/.m2/repository" + - emptyDirVolume: + memory: false + mountPath: "/home/jenkins/.m2/wrapper" + workspaceVolume: + emptyDirWorkspaceVolume: + memory: false + yaml: | + apiVersion: v1 + kind: Pod + spec: + containers: + - name: jnlp + resources: + limits: + cpu: "2000m" + memory: "4096Mi" + requests: + cpu: "1000m" + memory: "4096Mi" + volumeMounts: + - name: m2-secret-dir + mountPath: /home/jenkins/.m2/settings-security.xml + subPath: settings-security.xml + readOnly: true + - name: m2-secret-dir + mountPath: /home/jenkins/.m2/settings.xml + subPath: settings.xml + readOnly: true + - name: m2-dir + mountPath: /home/jenkins/.m2/toolchains.xml + subPath: toolchains.xml + readOnly: true + - name: m2-dir + mountPath: /home/jenkins/.mavenrc + subPath: .mavenrc + readOnly: true + volumes: + - name: m2-secret-dir + secret: + secretName: m2-secret-dir + - name: m2-dir + configMap: + name: m2-dir + inheritYamlMergeStrategy: "true" + yamlMergeStrategy: "merge" + - name: "ubuntu-2404" + namespace: "jpa" + label: "ubuntu-latest ubuntu-2404" + containers: + - name: "jnlp" + image: docker.io/eclipsecbi/jiro-agent-ubuntu-2404:remoting-3206.3208.v409508a_675ff + alwaysPullImage: true + livenessProbe: + failureThreshold: 0 + initialDelaySeconds: 0 + periodSeconds: 0 + successThreshold: 0 + timeoutSeconds: 0 + ttyEnabled: true + command: "" + args: "" + instanceCap: -1 + nodeUsageMode: EXCLUSIVE + envVars: + - envVar: + key: "JAVA_TOOL_OPTIONS" + 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" + - envVar: + key: "OPENJ9_JAVA_OPTIONS" + value: "-XX:+IgnoreUnrecognizedVMOptions -XX:+IdleTuningCompactOnIdle -XX:+IdleTuningGcOnIdle" + - envVar: + key: "_JAVA_OPTIONS" + value: "" + volumes: + - persistentVolumeClaim: + claimName: "tools-claim-jiro-jpa" + mountPath: "/opt/tools" + readOnly: true + - configMapVolume: + configMapName: "known-hosts" + mountPath: "/home/jenkins/.ssh/" + subPath: "." + - emptyDirVolume: + memory: false + mountPath: "/home/jenkins/" + - emptyDirVolume: + memory: false + mountPath: "/home/jenkins/.m2/repository" + - emptyDirVolume: + memory: false + mountPath: "/home/jenkins/.m2/wrapper" + workspaceVolume: + emptyDirWorkspaceVolume: + memory: false + yaml: | + apiVersion: v1 + kind: Pod + spec: + containers: + - name: jnlp + resources: + limits: + cpu: "2000m" + memory: "4096Mi" + requests: + cpu: "1000m" + memory: "4096Mi" + volumeMounts: + - name: m2-secret-dir + mountPath: /home/jenkins/.m2/settings-security.xml + subPath: settings-security.xml + readOnly: true + - name: m2-secret-dir + mountPath: /home/jenkins/.m2/settings.xml + subPath: settings.xml + readOnly: true + - name: m2-dir + mountPath: /home/jenkins/.m2/toolchains.xml + subPath: toolchains.xml + readOnly: true + - name: m2-dir + mountPath: /home/jenkins/.mavenrc + subPath: .mavenrc + readOnly: true + volumes: + - name: m2-secret-dir + secret: + secretName: m2-secret-dir + - name: m2-dir + configMap: + name: m2-dir + inheritYamlMergeStrategy: "true" + yamlMergeStrategy: "merge" security: apiToken: creationOfLegacyTokenEnabled: false @@ -602,6 +784,8 @@ data: home: "/opt/tools/java/openjdk/latest" - name: "openjdk-ea-latest" home: "/opt/tools/java/openjdk/ea-latest" + - name: "openjdk-jdk24-latest" + home: "/opt/tools/java/openjdk/jdk-24/latest" - name: "openjdk-jdk23-latest" home: "/opt/tools/java/openjdk/jdk-23/latest" - name: "openjdk-jdk22-latest" @@ -731,6 +915,8 @@ data: installations: - name: "apache-maven-latest" home: "/opt/tools/apache-maven/latest" + - name: "apache-maven-3.9.9" + home: "/opt/tools/apache-maven/3.9.9" - name: "apache-maven-3.9.6" home: "/opt/tools/apache-maven/3.9.6" - name: "apache-maven-3.9.5" diff --git a/instances/ee4j.jpa/target/k8s/m2-dir.json b/instances/ee4j.jpa/target/k8s/m2-dir.json index d8f91545d..d8d27edf5 100644 --- a/instances/ee4j.jpa/target/k8s/m2-dir.json +++ b/instances/ee4j.jpa/target/k8s/m2-dir.json @@ -2,7 +2,7 @@ "apiVersion": "v1", "data": { ".mavenrc": "set -- -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn --batch-mode \"${@}\"", - "toolchains.xml": "\n\n \n jdk\n \n JavaSE-1.8\n 1.8\n oracle\n \n /opt/tools/java/oracle/jdk-8/latest\n \n \n jdk\n \n JavaSE-9\n 9\n openjdk\n \n /opt/tools/java/openjdk/jdk-9/latest\n \n \n jdk\n \n JavaSE-10\n 10\n openjdk\n \n /opt/tools/java/openjdk/jdk-10/latest\n \n \n jdk\n \n JavaSE-11\n 11\n openjdk\n \n /opt/tools/java/openjdk/jdk-11/latest\n \n \n jdk\n \n JavaSE-12\n 12\n openjdk\n \n /opt/tools/java/openjdk/jdk-12/latest\n \n \n jdk\n \n JavaSE-13\n 13\n openjdk\n \n /opt/tools/java/openjdk/jdk-13/latest\n \n \n jdk\n \n JavaSE-14\n 14\n openjdk\n \n /opt/tools/java/openjdk/jdk-14/latest\n \n \n jdk\n \n JavaSE-15\n 15\n openjdk\n \n /opt/tools/java/openjdk/jdk-15/latest\n \n \n jdk\n \n JavaSE-16\n 16\n openjdk\n \n /opt/tools/java/openjdk/jdk-16/latest\n \n \n jdk\n \n JavaSE-17\n 17\n openjdk\n \n /opt/tools/java/openjdk/jdk-17/latest\n \n \n jdk\n \n JavaSE-18\n 18\n openjdk\n \n /opt/tools/java/openjdk/jdk-18/latest\n \n \n jdk\n \n JavaSE-19\n 19\n openjdk\n \n /opt/tools/java/openjdk/jdk-19/latest\n \n \n jdk\n \n JavaSE-20\n 20\n openjdk\n \n /opt/tools/java/openjdk/jdk-20/latest\n \n \n jdk\n \n JavaSE-21\n 21\n openjdk\n \n /opt/tools/java/openjdk/jdk-21/latest\n \n \n jdk\n \n JavaSE-22\n 22\n openjdk\n \n /opt/tools/java/openjdk/jdk-22/latest\n \n \n jdk\n \n JavaSE-23\n 23\n openjdk\n \n /opt/tools/java/openjdk/jdk-23/latest\n \n\n" + "toolchains.xml": "\n\n \n jdk\n \n JavaSE-1.8\n 1.8\n oracle\n \n /opt/tools/java/oracle/jdk-8/latest\n \n \n jdk\n \n JavaSE-9\n 9\n openjdk\n \n /opt/tools/java/openjdk/jdk-9/latest\n \n \n jdk\n \n JavaSE-10\n 10\n openjdk\n \n /opt/tools/java/openjdk/jdk-10/latest\n \n \n jdk\n \n JavaSE-11\n 11\n openjdk\n \n /opt/tools/java/openjdk/jdk-11/latest\n \n \n jdk\n \n JavaSE-12\n 12\n openjdk\n \n /opt/tools/java/openjdk/jdk-12/latest\n \n \n jdk\n \n JavaSE-13\n 13\n openjdk\n \n /opt/tools/java/openjdk/jdk-13/latest\n \n \n jdk\n \n JavaSE-14\n 14\n openjdk\n \n /opt/tools/java/openjdk/jdk-14/latest\n \n \n jdk\n \n JavaSE-15\n 15\n openjdk\n \n /opt/tools/java/openjdk/jdk-15/latest\n \n \n jdk\n \n JavaSE-16\n 16\n openjdk\n \n /opt/tools/java/openjdk/jdk-16/latest\n \n \n jdk\n \n JavaSE-17\n 17\n openjdk\n \n /opt/tools/java/openjdk/jdk-17/latest\n \n \n jdk\n \n JavaSE-18\n 18\n openjdk\n \n /opt/tools/java/openjdk/jdk-18/latest\n \n \n jdk\n \n JavaSE-19\n 19\n openjdk\n \n /opt/tools/java/openjdk/jdk-19/latest\n \n \n jdk\n \n JavaSE-20\n 20\n openjdk\n \n /opt/tools/java/openjdk/jdk-20/latest\n \n \n jdk\n \n JavaSE-21\n 21\n openjdk\n \n /opt/tools/java/openjdk/jdk-21/latest\n \n \n jdk\n \n JavaSE-22\n 22\n openjdk\n \n /opt/tools/java/openjdk/jdk-22/latest\n \n \n jdk\n \n JavaSE-23\n 23\n openjdk\n \n /opt/tools/java/openjdk/jdk-23/latest\n \n \n jdk\n \n JavaSE-24\n 24\n openjdk\n \n /opt/tools/java/openjdk/jdk-24/latest\n \n\n" }, "kind": "ConfigMap", "metadata": { diff --git a/instances/ee4j.jpa/target/k8s/statefulset.json b/instances/ee4j.jpa/target/k8s/statefulset.json index bd70c2172..10744457b 100644 --- a/instances/ee4j.jpa/target/k8s/statefulset.json +++ b/instances/ee4j.jpa/target/k8s/statefulset.json @@ -119,6 +119,12 @@ "cpu": "250m" } }, + "securityContext": { + "seLinuxOptions": { + "level": "s0:c44,c29", + "type": "spc_t" + } + }, "volumeMounts": [ { "mountPath": "/var/jenkins", diff --git a/instances/ee4j.jsonb/config.jsonnet b/instances/ee4j.jsonb/config.jsonnet index 7b7790175..5f49790df 100644 --- a/instances/ee4j.jsonb/config.jsonnet +++ b/instances/ee4j.jsonb/config.jsonnet @@ -7,5 +7,6 @@ plugins+: [ "copyartifact", ], - } + }, + seLinuxLevel: "s0:c44,c34", } diff --git a/instances/ee4j.jsonb/target/config.json b/instances/ee4j.jsonb/target/config.json index 1914a92ae..b17796f3c 100644 --- a/instances/ee4j.jsonb/target/config.json +++ b/instances/ee4j.jsonb/target/config.json @@ -217,7 +217,7 @@ "docker.io/eclipsecbi/jiro-agent-centos-7:latest" ], "context": "centos-7", - "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-centos-7: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 [ \"uid_entrypoint\", \"/usr/local/bin/jenkins-agent\" ]\n\nADD \"https://repo.jenkins-ci.org/public/org/jenkins-ci/main/remoting/3206.3208.v409508a_675ff/remoting-3206.3208.v409508a_675ff.jar\" \"/usr/share/jenkins/agent.jar\" \nADD \"https://github.com/jenkinsci/docker-agent/raw/3206.vb_15dcf73f6a_9-12/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\nUSER 10001:0\n", + "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-centos-7: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/3206.3208.v409508a_675ff/remoting-3206.3208.v409508a_675ff.jar\" \"/usr/share/jenkins/agent.jar\"\nADD \"https://github.com/jenkinsci/docker-agent/raw/3206.vb_15dcf73f6a_9-12/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\nUSER 10001:0\n", "image": "jiro-agent-centos-7", "registry": "docker.io", "repository": "eclipsecbi", @@ -316,7 +316,7 @@ "docker.io/eclipsecbi/jiro-agent-centos-8:latest" ], "context": "centos-8", - "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-centos-8: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 [ \"uid_entrypoint\", \"/usr/local/bin/jenkins-agent\" ]\n\nADD \"https://repo.jenkins-ci.org/public/org/jenkins-ci/main/remoting/3206.3208.v409508a_675ff/remoting-3206.3208.v409508a_675ff.jar\" \"/usr/share/jenkins/agent.jar\" \nADD \"https://github.com/jenkinsci/docker-agent/raw/3206.vb_15dcf73f6a_9-12/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\nUSER 10001:0\n", + "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-centos-8: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/3206.3208.v409508a_675ff/remoting-3206.3208.v409508a_675ff.jar\" \"/usr/share/jenkins/agent.jar\"\nADD \"https://github.com/jenkinsci/docker-agent/raw/3206.vb_15dcf73f6a_9-12/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\nUSER 10001:0\n", "image": "jiro-agent-centos-8", "registry": "docker.io", "repository": "eclipsecbi", @@ -406,6 +406,203 @@ }, "startupScript": "/usr/local/bin/jenkins-agent", "username": "jenkins" + }, + "ubuntu-2204": { + "agentWorkdir": "/home/jenkins/jenkins-agent", + "docker": { + "aliases": [ + "docker.io/eclipsecbi/jiro-agent-ubuntu-2204:latest" + ], + "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-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/3206.3208.v409508a_675ff/remoting-3206.3208.v409508a_675ff.jar\" \"/usr/share/jenkins/agent.jar\"\nADD \"https://github.com/jenkinsci/docker-agent/raw/3206.vb_15dcf73f6a_9-12/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\nUSER 10001:0\n", + "image": "jiro-agent-ubuntu-2204", + "registry": "docker.io", + "repository": "eclipsecbi", + "tag": "remoting-3206.3208.v409508a_675ff" + }, + "env": { + "JAVA_TOOL_OPTIONS": [ ], + "JENKINS_REMOTING_JAVA_OPTS": [ + "-showversion", + "-XshowSettings:vm", + "-Xmx256m", + "-Dorg.jenkinsci.remoting.engine.JnlpProtocol3.disabled=true", + "-Dorg.jenkinsci.plugins.gitclient.CliGitAPIImpl.useSETSID=true" + ], + "OPENJ9_JAVA_OPTIONS": [ + "-XX:+IgnoreUnrecognizedVMOptions", + "-XX:+IdleTuningCompactOnIdle", + "-XX:+IdleTuningGcOnIdle" + ], + "_JAVA_OPTIONS": [ ] + }, + "home": "/home/jenkins", + "kubernetes": { + "inheritYamlMergeStrategy": true, + "resources": { + "cpu": { + "limit": "2000m", + "request": "1000m" + }, + "memory": { + "limit": "4096Mi", + "request": "4096Mi" + } + }, + "volumes": [ + { + "mounts": [ + { + "mountPath": "/home/jenkins/.m2/settings-security.xml", + "subPath": "settings-security.xml" + }, + { + "mountPath": "/home/jenkins/.m2/settings.xml", + "subPath": "settings.xml" + } + ], + "name": "m2-secret-dir", + "secret": { + "name": "m2-secret-dir" + } + }, + { + "configMap": { + "name": "m2-dir" + }, + "mounts": [ + { + "mountPath": "/home/jenkins/.m2/toolchains.xml", + "subPath": "toolchains.xml" + }, + { + "mountPath": "/home/jenkins/.mavenrc", + "subPath": ".mavenrc" + } + ], + "name": "m2-dir" + } + ], + "yamlMergeStrategy": "merge" + }, + "labels": [ + "ubuntu-2204" + ], + "maxHeap": "256m", + "mode": "EXCLUSIVE", + "name": "ubuntu-2204", + "remoting": { + "jar": "/usr/share/jenkins/agent.jar", + "startupScript": { + "name": "jenkins-agent", + "url": "https://github.com/jenkinsci/docker-agent/raw/3206.vb_15dcf73f6a_9-12/jenkins-agent", + "version": "3206.vb_15dcf73f6a_9-12" + }, + "url": "https://repo.jenkins-ci.org/public/org/jenkins-ci/main/remoting/3206.3208.v409508a_675ff/remoting-3206.3208.v409508a_675ff.jar", + "version": "3206.3208.v409508a_675ff" + }, + "startupScript": "/usr/local/bin/jenkins-agent", + "username": "jenkins" + }, + "ubuntu-2404": { + "agentWorkdir": "/home/jenkins/jenkins-agent", + "docker": { + "aliases": [ + "docker.io/eclipsecbi/jiro-agent-ubuntu-2404:latest" + ], + "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-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/3206.3208.v409508a_675ff/remoting-3206.3208.v409508a_675ff.jar\" \"/usr/share/jenkins/agent.jar\"\nADD \"https://github.com/jenkinsci/docker-agent/raw/3206.vb_15dcf73f6a_9-12/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\nUSER 10001:0\n", + "image": "jiro-agent-ubuntu-2404", + "registry": "docker.io", + "repository": "eclipsecbi", + "tag": "remoting-3206.3208.v409508a_675ff" + }, + "env": { + "JAVA_TOOL_OPTIONS": [ ], + "JENKINS_REMOTING_JAVA_OPTS": [ + "-showversion", + "-XshowSettings:vm", + "-Xmx256m", + "-Dorg.jenkinsci.remoting.engine.JnlpProtocol3.disabled=true", + "-Dorg.jenkinsci.plugins.gitclient.CliGitAPIImpl.useSETSID=true" + ], + "OPENJ9_JAVA_OPTIONS": [ + "-XX:+IgnoreUnrecognizedVMOptions", + "-XX:+IdleTuningCompactOnIdle", + "-XX:+IdleTuningGcOnIdle" + ], + "_JAVA_OPTIONS": [ ] + }, + "home": "/home/jenkins", + "kubernetes": { + "inheritYamlMergeStrategy": true, + "resources": { + "cpu": { + "limit": "2000m", + "request": "1000m" + }, + "memory": { + "limit": "4096Mi", + "request": "4096Mi" + } + }, + "volumes": [ + { + "mounts": [ + { + "mountPath": "/home/jenkins/.m2/settings-security.xml", + "subPath": "settings-security.xml" + }, + { + "mountPath": "/home/jenkins/.m2/settings.xml", + "subPath": "settings.xml" + } + ], + "name": "m2-secret-dir", + "secret": { + "name": "m2-secret-dir" + } + }, + { + "configMap": { + "name": "m2-dir" + }, + "mounts": [ + { + "mountPath": "/home/jenkins/.m2/toolchains.xml", + "subPath": "toolchains.xml" + }, + { + "mountPath": "/home/jenkins/.mavenrc", + "subPath": ".mavenrc" + } + ], + "name": "m2-dir" + } + ], + "yamlMergeStrategy": "merge" + }, + "labels": [ + "ubuntu-latest", + "ubuntu-2404" + ], + "maxHeap": "256m", + "mode": "EXCLUSIVE", + "name": "ubuntu-2404", + "remoting": { + "jar": "/usr/share/jenkins/agent.jar", + "startupScript": { + "name": "jenkins-agent", + "url": "https://github.com/jenkinsci/docker-agent/raw/3206.vb_15dcf73f6a_9-12/jenkins-agent", + "version": "3206.vb_15dcf73f6a_9-12" + }, + "url": "https://repo.jenkins-ci.org/public/org/jenkins-ci/main/remoting/3206.3208.v409508a_675ff/remoting-3206.3208.v409508a_675ff.jar", + "version": "3206.3208.v409508a_675ff" + }, + "startupScript": "/usr/local/bin/jenkins-agent", + "username": "jenkins" } } } @@ -754,6 +951,7 @@ }, "generate": false }, + "seLinuxLevel": "s0:c44,c34", "secrets": { "dockerconfigjson": { "dockerconfigjson-for-pull-as-default": { diff --git a/instances/ee4j.jsonb/target/jenkins/configuration.yml b/instances/ee4j.jsonb/target/jenkins/configuration.yml index c651d52d4..6e682a7dd 100644 --- a/instances/ee4j.jsonb/target/jenkins/configuration.yml +++ b/instances/ee4j.jsonb/target/jenkins/configuration.yml @@ -485,6 +485,188 @@ jenkins: name: m2-dir inheritYamlMergeStrategy: "true" yamlMergeStrategy: "merge" + - name: "ubuntu-2204" + namespace: "jsonb" + label: "ubuntu-2204" + containers: + - name: "jnlp" + image: docker.io/eclipsecbi/jiro-agent-ubuntu-2204:remoting-3206.3208.v409508a_675ff + alwaysPullImage: true + livenessProbe: + failureThreshold: 0 + initialDelaySeconds: 0 + periodSeconds: 0 + successThreshold: 0 + timeoutSeconds: 0 + ttyEnabled: true + command: "" + args: "" + instanceCap: -1 + nodeUsageMode: EXCLUSIVE + envVars: + - envVar: + key: "JAVA_TOOL_OPTIONS" + 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" + - envVar: + key: "OPENJ9_JAVA_OPTIONS" + value: "-XX:+IgnoreUnrecognizedVMOptions -XX:+IdleTuningCompactOnIdle -XX:+IdleTuningGcOnIdle" + - envVar: + key: "_JAVA_OPTIONS" + value: "" + volumes: + - persistentVolumeClaim: + claimName: "tools-claim-jiro-jsonb" + mountPath: "/opt/tools" + readOnly: true + - configMapVolume: + configMapName: "known-hosts" + mountPath: "/home/jenkins/.ssh/" + subPath: "." + - emptyDirVolume: + memory: false + mountPath: "/home/jenkins/" + - emptyDirVolume: + memory: false + mountPath: "/home/jenkins/.m2/repository" + - emptyDirVolume: + memory: false + mountPath: "/home/jenkins/.m2/wrapper" + workspaceVolume: + emptyDirWorkspaceVolume: + memory: false + yaml: | + apiVersion: v1 + kind: Pod + spec: + containers: + - name: jnlp + resources: + limits: + cpu: "2000m" + memory: "4096Mi" + requests: + cpu: "1000m" + memory: "4096Mi" + volumeMounts: + - name: m2-secret-dir + mountPath: /home/jenkins/.m2/settings-security.xml + subPath: settings-security.xml + readOnly: true + - name: m2-secret-dir + mountPath: /home/jenkins/.m2/settings.xml + subPath: settings.xml + readOnly: true + - name: m2-dir + mountPath: /home/jenkins/.m2/toolchains.xml + subPath: toolchains.xml + readOnly: true + - name: m2-dir + mountPath: /home/jenkins/.mavenrc + subPath: .mavenrc + readOnly: true + volumes: + - name: m2-secret-dir + secret: + secretName: m2-secret-dir + - name: m2-dir + configMap: + name: m2-dir + inheritYamlMergeStrategy: "true" + yamlMergeStrategy: "merge" + - name: "ubuntu-2404" + namespace: "jsonb" + label: "ubuntu-latest ubuntu-2404" + containers: + - name: "jnlp" + image: docker.io/eclipsecbi/jiro-agent-ubuntu-2404:remoting-3206.3208.v409508a_675ff + alwaysPullImage: true + livenessProbe: + failureThreshold: 0 + initialDelaySeconds: 0 + periodSeconds: 0 + successThreshold: 0 + timeoutSeconds: 0 + ttyEnabled: true + command: "" + args: "" + instanceCap: -1 + nodeUsageMode: EXCLUSIVE + envVars: + - envVar: + key: "JAVA_TOOL_OPTIONS" + 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" + - envVar: + key: "OPENJ9_JAVA_OPTIONS" + value: "-XX:+IgnoreUnrecognizedVMOptions -XX:+IdleTuningCompactOnIdle -XX:+IdleTuningGcOnIdle" + - envVar: + key: "_JAVA_OPTIONS" + value: "" + volumes: + - persistentVolumeClaim: + claimName: "tools-claim-jiro-jsonb" + mountPath: "/opt/tools" + readOnly: true + - configMapVolume: + configMapName: "known-hosts" + mountPath: "/home/jenkins/.ssh/" + subPath: "." + - emptyDirVolume: + memory: false + mountPath: "/home/jenkins/" + - emptyDirVolume: + memory: false + mountPath: "/home/jenkins/.m2/repository" + - emptyDirVolume: + memory: false + mountPath: "/home/jenkins/.m2/wrapper" + workspaceVolume: + emptyDirWorkspaceVolume: + memory: false + yaml: | + apiVersion: v1 + kind: Pod + spec: + containers: + - name: jnlp + resources: + limits: + cpu: "2000m" + memory: "4096Mi" + requests: + cpu: "1000m" + memory: "4096Mi" + volumeMounts: + - name: m2-secret-dir + mountPath: /home/jenkins/.m2/settings-security.xml + subPath: settings-security.xml + readOnly: true + - name: m2-secret-dir + mountPath: /home/jenkins/.m2/settings.xml + subPath: settings.xml + readOnly: true + - name: m2-dir + mountPath: /home/jenkins/.m2/toolchains.xml + subPath: toolchains.xml + readOnly: true + - name: m2-dir + mountPath: /home/jenkins/.mavenrc + subPath: .mavenrc + readOnly: true + volumes: + - name: m2-secret-dir + secret: + secretName: m2-secret-dir + - name: m2-dir + configMap: + name: m2-dir + inheritYamlMergeStrategy: "true" + yamlMergeStrategy: "merge" security: apiToken: creationOfLegacyTokenEnabled: false @@ -579,6 +761,8 @@ tool: home: "/opt/tools/java/openjdk/latest" - name: "openjdk-ea-latest" home: "/opt/tools/java/openjdk/ea-latest" + - name: "openjdk-jdk24-latest" + home: "/opt/tools/java/openjdk/jdk-24/latest" - name: "openjdk-jdk23-latest" home: "/opt/tools/java/openjdk/jdk-23/latest" - name: "openjdk-jdk22-latest" @@ -708,6 +892,8 @@ tool: installations: - name: "apache-maven-latest" home: "/opt/tools/apache-maven/latest" + - name: "apache-maven-3.9.9" + home: "/opt/tools/apache-maven/3.9.9" - name: "apache-maven-3.9.6" home: "/opt/tools/apache-maven/3.9.6" - name: "apache-maven-3.9.5" diff --git a/instances/ee4j.jsonb/target/k8s/configmap-jenkins-config.yml b/instances/ee4j.jsonb/target/k8s/configmap-jenkins-config.yml index 61485f487..7e0d89b46 100644 --- a/instances/ee4j.jsonb/target/k8s/configmap-jenkins-config.yml +++ b/instances/ee4j.jsonb/target/k8s/configmap-jenkins-config.yml @@ -508,6 +508,188 @@ data: name: m2-dir inheritYamlMergeStrategy: "true" yamlMergeStrategy: "merge" + - name: "ubuntu-2204" + namespace: "jsonb" + label: "ubuntu-2204" + containers: + - name: "jnlp" + image: docker.io/eclipsecbi/jiro-agent-ubuntu-2204:remoting-3206.3208.v409508a_675ff + alwaysPullImage: true + livenessProbe: + failureThreshold: 0 + initialDelaySeconds: 0 + periodSeconds: 0 + successThreshold: 0 + timeoutSeconds: 0 + ttyEnabled: true + command: "" + args: "" + instanceCap: -1 + nodeUsageMode: EXCLUSIVE + envVars: + - envVar: + key: "JAVA_TOOL_OPTIONS" + 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" + - envVar: + key: "OPENJ9_JAVA_OPTIONS" + value: "-XX:+IgnoreUnrecognizedVMOptions -XX:+IdleTuningCompactOnIdle -XX:+IdleTuningGcOnIdle" + - envVar: + key: "_JAVA_OPTIONS" + value: "" + volumes: + - persistentVolumeClaim: + claimName: "tools-claim-jiro-jsonb" + mountPath: "/opt/tools" + readOnly: true + - configMapVolume: + configMapName: "known-hosts" + mountPath: "/home/jenkins/.ssh/" + subPath: "." + - emptyDirVolume: + memory: false + mountPath: "/home/jenkins/" + - emptyDirVolume: + memory: false + mountPath: "/home/jenkins/.m2/repository" + - emptyDirVolume: + memory: false + mountPath: "/home/jenkins/.m2/wrapper" + workspaceVolume: + emptyDirWorkspaceVolume: + memory: false + yaml: | + apiVersion: v1 + kind: Pod + spec: + containers: + - name: jnlp + resources: + limits: + cpu: "2000m" + memory: "4096Mi" + requests: + cpu: "1000m" + memory: "4096Mi" + volumeMounts: + - name: m2-secret-dir + mountPath: /home/jenkins/.m2/settings-security.xml + subPath: settings-security.xml + readOnly: true + - name: m2-secret-dir + mountPath: /home/jenkins/.m2/settings.xml + subPath: settings.xml + readOnly: true + - name: m2-dir + mountPath: /home/jenkins/.m2/toolchains.xml + subPath: toolchains.xml + readOnly: true + - name: m2-dir + mountPath: /home/jenkins/.mavenrc + subPath: .mavenrc + readOnly: true + volumes: + - name: m2-secret-dir + secret: + secretName: m2-secret-dir + - name: m2-dir + configMap: + name: m2-dir + inheritYamlMergeStrategy: "true" + yamlMergeStrategy: "merge" + - name: "ubuntu-2404" + namespace: "jsonb" + label: "ubuntu-latest ubuntu-2404" + containers: + - name: "jnlp" + image: docker.io/eclipsecbi/jiro-agent-ubuntu-2404:remoting-3206.3208.v409508a_675ff + alwaysPullImage: true + livenessProbe: + failureThreshold: 0 + initialDelaySeconds: 0 + periodSeconds: 0 + successThreshold: 0 + timeoutSeconds: 0 + ttyEnabled: true + command: "" + args: "" + instanceCap: -1 + nodeUsageMode: EXCLUSIVE + envVars: + - envVar: + key: "JAVA_TOOL_OPTIONS" + 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" + - envVar: + key: "OPENJ9_JAVA_OPTIONS" + value: "-XX:+IgnoreUnrecognizedVMOptions -XX:+IdleTuningCompactOnIdle -XX:+IdleTuningGcOnIdle" + - envVar: + key: "_JAVA_OPTIONS" + value: "" + volumes: + - persistentVolumeClaim: + claimName: "tools-claim-jiro-jsonb" + mountPath: "/opt/tools" + readOnly: true + - configMapVolume: + configMapName: "known-hosts" + mountPath: "/home/jenkins/.ssh/" + subPath: "." + - emptyDirVolume: + memory: false + mountPath: "/home/jenkins/" + - emptyDirVolume: + memory: false + mountPath: "/home/jenkins/.m2/repository" + - emptyDirVolume: + memory: false + mountPath: "/home/jenkins/.m2/wrapper" + workspaceVolume: + emptyDirWorkspaceVolume: + memory: false + yaml: | + apiVersion: v1 + kind: Pod + spec: + containers: + - name: jnlp + resources: + limits: + cpu: "2000m" + memory: "4096Mi" + requests: + cpu: "1000m" + memory: "4096Mi" + volumeMounts: + - name: m2-secret-dir + mountPath: /home/jenkins/.m2/settings-security.xml + subPath: settings-security.xml + readOnly: true + - name: m2-secret-dir + mountPath: /home/jenkins/.m2/settings.xml + subPath: settings.xml + readOnly: true + - name: m2-dir + mountPath: /home/jenkins/.m2/toolchains.xml + subPath: toolchains.xml + readOnly: true + - name: m2-dir + mountPath: /home/jenkins/.mavenrc + subPath: .mavenrc + readOnly: true + volumes: + - name: m2-secret-dir + secret: + secretName: m2-secret-dir + - name: m2-dir + configMap: + name: m2-dir + inheritYamlMergeStrategy: "true" + yamlMergeStrategy: "merge" security: apiToken: creationOfLegacyTokenEnabled: false @@ -602,6 +784,8 @@ data: home: "/opt/tools/java/openjdk/latest" - name: "openjdk-ea-latest" home: "/opt/tools/java/openjdk/ea-latest" + - name: "openjdk-jdk24-latest" + home: "/opt/tools/java/openjdk/jdk-24/latest" - name: "openjdk-jdk23-latest" home: "/opt/tools/java/openjdk/jdk-23/latest" - name: "openjdk-jdk22-latest" @@ -731,6 +915,8 @@ data: installations: - name: "apache-maven-latest" home: "/opt/tools/apache-maven/latest" + - name: "apache-maven-3.9.9" + home: "/opt/tools/apache-maven/3.9.9" - name: "apache-maven-3.9.6" home: "/opt/tools/apache-maven/3.9.6" - name: "apache-maven-3.9.5" diff --git a/instances/ee4j.jsonb/target/k8s/m2-dir.json b/instances/ee4j.jsonb/target/k8s/m2-dir.json index 286bdaab3..d3f61c985 100644 --- a/instances/ee4j.jsonb/target/k8s/m2-dir.json +++ b/instances/ee4j.jsonb/target/k8s/m2-dir.json @@ -2,7 +2,7 @@ "apiVersion": "v1", "data": { ".mavenrc": "set -- -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn --batch-mode \"${@}\"", - "toolchains.xml": "\n\n \n jdk\n \n JavaSE-1.8\n 1.8\n oracle\n \n /opt/tools/java/oracle/jdk-8/latest\n \n \n jdk\n \n JavaSE-9\n 9\n openjdk\n \n /opt/tools/java/openjdk/jdk-9/latest\n \n \n jdk\n \n JavaSE-10\n 10\n openjdk\n \n /opt/tools/java/openjdk/jdk-10/latest\n \n \n jdk\n \n JavaSE-11\n 11\n openjdk\n \n /opt/tools/java/openjdk/jdk-11/latest\n \n \n jdk\n \n JavaSE-12\n 12\n openjdk\n \n /opt/tools/java/openjdk/jdk-12/latest\n \n \n jdk\n \n JavaSE-13\n 13\n openjdk\n \n /opt/tools/java/openjdk/jdk-13/latest\n \n \n jdk\n \n JavaSE-14\n 14\n openjdk\n \n /opt/tools/java/openjdk/jdk-14/latest\n \n \n jdk\n \n JavaSE-15\n 15\n openjdk\n \n /opt/tools/java/openjdk/jdk-15/latest\n \n \n jdk\n \n JavaSE-16\n 16\n openjdk\n \n /opt/tools/java/openjdk/jdk-16/latest\n \n \n jdk\n \n JavaSE-17\n 17\n openjdk\n \n /opt/tools/java/openjdk/jdk-17/latest\n \n \n jdk\n \n JavaSE-18\n 18\n openjdk\n \n /opt/tools/java/openjdk/jdk-18/latest\n \n \n jdk\n \n JavaSE-19\n 19\n openjdk\n \n /opt/tools/java/openjdk/jdk-19/latest\n \n \n jdk\n \n JavaSE-20\n 20\n openjdk\n \n /opt/tools/java/openjdk/jdk-20/latest\n \n \n jdk\n \n JavaSE-21\n 21\n openjdk\n \n /opt/tools/java/openjdk/jdk-21/latest\n \n \n jdk\n \n JavaSE-22\n 22\n openjdk\n \n /opt/tools/java/openjdk/jdk-22/latest\n \n \n jdk\n \n JavaSE-23\n 23\n openjdk\n \n /opt/tools/java/openjdk/jdk-23/latest\n \n\n" + "toolchains.xml": "\n\n \n jdk\n \n JavaSE-1.8\n 1.8\n oracle\n \n /opt/tools/java/oracle/jdk-8/latest\n \n \n jdk\n \n JavaSE-9\n 9\n openjdk\n \n /opt/tools/java/openjdk/jdk-9/latest\n \n \n jdk\n \n JavaSE-10\n 10\n openjdk\n \n /opt/tools/java/openjdk/jdk-10/latest\n \n \n jdk\n \n JavaSE-11\n 11\n openjdk\n \n /opt/tools/java/openjdk/jdk-11/latest\n \n \n jdk\n \n JavaSE-12\n 12\n openjdk\n \n /opt/tools/java/openjdk/jdk-12/latest\n \n \n jdk\n \n JavaSE-13\n 13\n openjdk\n \n /opt/tools/java/openjdk/jdk-13/latest\n \n \n jdk\n \n JavaSE-14\n 14\n openjdk\n \n /opt/tools/java/openjdk/jdk-14/latest\n \n \n jdk\n \n JavaSE-15\n 15\n openjdk\n \n /opt/tools/java/openjdk/jdk-15/latest\n \n \n jdk\n \n JavaSE-16\n 16\n openjdk\n \n /opt/tools/java/openjdk/jdk-16/latest\n \n \n jdk\n \n JavaSE-17\n 17\n openjdk\n \n /opt/tools/java/openjdk/jdk-17/latest\n \n \n jdk\n \n JavaSE-18\n 18\n openjdk\n \n /opt/tools/java/openjdk/jdk-18/latest\n \n \n jdk\n \n JavaSE-19\n 19\n openjdk\n \n /opt/tools/java/openjdk/jdk-19/latest\n \n \n jdk\n \n JavaSE-20\n 20\n openjdk\n \n /opt/tools/java/openjdk/jdk-20/latest\n \n \n jdk\n \n JavaSE-21\n 21\n openjdk\n \n /opt/tools/java/openjdk/jdk-21/latest\n \n \n jdk\n \n JavaSE-22\n 22\n openjdk\n \n /opt/tools/java/openjdk/jdk-22/latest\n \n \n jdk\n \n JavaSE-23\n 23\n openjdk\n \n /opt/tools/java/openjdk/jdk-23/latest\n \n \n jdk\n \n JavaSE-24\n 24\n openjdk\n \n /opt/tools/java/openjdk/jdk-24/latest\n \n\n" }, "kind": "ConfigMap", "metadata": { diff --git a/instances/ee4j.jsonb/target/k8s/statefulset.json b/instances/ee4j.jsonb/target/k8s/statefulset.json index 3af06f858..d21194dd9 100644 --- a/instances/ee4j.jsonb/target/k8s/statefulset.json +++ b/instances/ee4j.jsonb/target/k8s/statefulset.json @@ -119,6 +119,12 @@ "cpu": "250m" } }, + "securityContext": { + "seLinuxOptions": { + "level": "s0:c44,c34", + "type": "spc_t" + } + }, "volumeMounts": [ { "mountPath": "/var/jenkins", diff --git a/instances/ee4j.jstl/config.jsonnet b/instances/ee4j.jstl/config.jsonnet index 1b0a72d37..e958c04fb 100644 --- a/instances/ee4j.jstl/config.jsonnet +++ b/instances/ee4j.jstl/config.jsonnet @@ -5,5 +5,6 @@ }, maven+: { showVersion: false, - } + }, + seLinuxLevel: "s0:c45,c5", } diff --git a/instances/ee4j.jstl/target/config.json b/instances/ee4j.jstl/target/config.json index 6d02fad0e..f1074239c 100644 --- a/instances/ee4j.jstl/target/config.json +++ b/instances/ee4j.jstl/target/config.json @@ -217,7 +217,7 @@ "docker.io/eclipsecbi/jiro-agent-centos-7:latest" ], "context": "centos-7", - "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-centos-7: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 [ \"uid_entrypoint\", \"/usr/local/bin/jenkins-agent\" ]\n\nADD \"https://repo.jenkins-ci.org/public/org/jenkins-ci/main/remoting/3206.3208.v409508a_675ff/remoting-3206.3208.v409508a_675ff.jar\" \"/usr/share/jenkins/agent.jar\" \nADD \"https://github.com/jenkinsci/docker-agent/raw/3206.vb_15dcf73f6a_9-12/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\nUSER 10001:0\n", + "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-centos-7: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/3206.3208.v409508a_675ff/remoting-3206.3208.v409508a_675ff.jar\" \"/usr/share/jenkins/agent.jar\"\nADD \"https://github.com/jenkinsci/docker-agent/raw/3206.vb_15dcf73f6a_9-12/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\nUSER 10001:0\n", "image": "jiro-agent-centos-7", "registry": "docker.io", "repository": "eclipsecbi", @@ -316,7 +316,7 @@ "docker.io/eclipsecbi/jiro-agent-centos-8:latest" ], "context": "centos-8", - "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-centos-8: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 [ \"uid_entrypoint\", \"/usr/local/bin/jenkins-agent\" ]\n\nADD \"https://repo.jenkins-ci.org/public/org/jenkins-ci/main/remoting/3206.3208.v409508a_675ff/remoting-3206.3208.v409508a_675ff.jar\" \"/usr/share/jenkins/agent.jar\" \nADD \"https://github.com/jenkinsci/docker-agent/raw/3206.vb_15dcf73f6a_9-12/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\nUSER 10001:0\n", + "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-centos-8: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/3206.3208.v409508a_675ff/remoting-3206.3208.v409508a_675ff.jar\" \"/usr/share/jenkins/agent.jar\"\nADD \"https://github.com/jenkinsci/docker-agent/raw/3206.vb_15dcf73f6a_9-12/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\nUSER 10001:0\n", "image": "jiro-agent-centos-8", "registry": "docker.io", "repository": "eclipsecbi", @@ -406,6 +406,203 @@ }, "startupScript": "/usr/local/bin/jenkins-agent", "username": "jenkins" + }, + "ubuntu-2204": { + "agentWorkdir": "/home/jenkins/jenkins-agent", + "docker": { + "aliases": [ + "docker.io/eclipsecbi/jiro-agent-ubuntu-2204:latest" + ], + "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-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/3206.3208.v409508a_675ff/remoting-3206.3208.v409508a_675ff.jar\" \"/usr/share/jenkins/agent.jar\"\nADD \"https://github.com/jenkinsci/docker-agent/raw/3206.vb_15dcf73f6a_9-12/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\nUSER 10001:0\n", + "image": "jiro-agent-ubuntu-2204", + "registry": "docker.io", + "repository": "eclipsecbi", + "tag": "remoting-3206.3208.v409508a_675ff" + }, + "env": { + "JAVA_TOOL_OPTIONS": [ ], + "JENKINS_REMOTING_JAVA_OPTS": [ + "-showversion", + "-XshowSettings:vm", + "-Xmx256m", + "-Dorg.jenkinsci.remoting.engine.JnlpProtocol3.disabled=true", + "-Dorg.jenkinsci.plugins.gitclient.CliGitAPIImpl.useSETSID=true" + ], + "OPENJ9_JAVA_OPTIONS": [ + "-XX:+IgnoreUnrecognizedVMOptions", + "-XX:+IdleTuningCompactOnIdle", + "-XX:+IdleTuningGcOnIdle" + ], + "_JAVA_OPTIONS": [ ] + }, + "home": "/home/jenkins", + "kubernetes": { + "inheritYamlMergeStrategy": true, + "resources": { + "cpu": { + "limit": "2000m", + "request": "1000m" + }, + "memory": { + "limit": "4096Mi", + "request": "4096Mi" + } + }, + "volumes": [ + { + "mounts": [ + { + "mountPath": "/home/jenkins/.m2/settings-security.xml", + "subPath": "settings-security.xml" + }, + { + "mountPath": "/home/jenkins/.m2/settings.xml", + "subPath": "settings.xml" + } + ], + "name": "m2-secret-dir", + "secret": { + "name": "m2-secret-dir" + } + }, + { + "configMap": { + "name": "m2-dir" + }, + "mounts": [ + { + "mountPath": "/home/jenkins/.m2/toolchains.xml", + "subPath": "toolchains.xml" + }, + { + "mountPath": "/home/jenkins/.mavenrc", + "subPath": ".mavenrc" + } + ], + "name": "m2-dir" + } + ], + "yamlMergeStrategy": "merge" + }, + "labels": [ + "ubuntu-2204" + ], + "maxHeap": "256m", + "mode": "EXCLUSIVE", + "name": "ubuntu-2204", + "remoting": { + "jar": "/usr/share/jenkins/agent.jar", + "startupScript": { + "name": "jenkins-agent", + "url": "https://github.com/jenkinsci/docker-agent/raw/3206.vb_15dcf73f6a_9-12/jenkins-agent", + "version": "3206.vb_15dcf73f6a_9-12" + }, + "url": "https://repo.jenkins-ci.org/public/org/jenkins-ci/main/remoting/3206.3208.v409508a_675ff/remoting-3206.3208.v409508a_675ff.jar", + "version": "3206.3208.v409508a_675ff" + }, + "startupScript": "/usr/local/bin/jenkins-agent", + "username": "jenkins" + }, + "ubuntu-2404": { + "agentWorkdir": "/home/jenkins/jenkins-agent", + "docker": { + "aliases": [ + "docker.io/eclipsecbi/jiro-agent-ubuntu-2404:latest" + ], + "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-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/3206.3208.v409508a_675ff/remoting-3206.3208.v409508a_675ff.jar\" \"/usr/share/jenkins/agent.jar\"\nADD \"https://github.com/jenkinsci/docker-agent/raw/3206.vb_15dcf73f6a_9-12/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\nUSER 10001:0\n", + "image": "jiro-agent-ubuntu-2404", + "registry": "docker.io", + "repository": "eclipsecbi", + "tag": "remoting-3206.3208.v409508a_675ff" + }, + "env": { + "JAVA_TOOL_OPTIONS": [ ], + "JENKINS_REMOTING_JAVA_OPTS": [ + "-showversion", + "-XshowSettings:vm", + "-Xmx256m", + "-Dorg.jenkinsci.remoting.engine.JnlpProtocol3.disabled=true", + "-Dorg.jenkinsci.plugins.gitclient.CliGitAPIImpl.useSETSID=true" + ], + "OPENJ9_JAVA_OPTIONS": [ + "-XX:+IgnoreUnrecognizedVMOptions", + "-XX:+IdleTuningCompactOnIdle", + "-XX:+IdleTuningGcOnIdle" + ], + "_JAVA_OPTIONS": [ ] + }, + "home": "/home/jenkins", + "kubernetes": { + "inheritYamlMergeStrategy": true, + "resources": { + "cpu": { + "limit": "2000m", + "request": "1000m" + }, + "memory": { + "limit": "4096Mi", + "request": "4096Mi" + } + }, + "volumes": [ + { + "mounts": [ + { + "mountPath": "/home/jenkins/.m2/settings-security.xml", + "subPath": "settings-security.xml" + }, + { + "mountPath": "/home/jenkins/.m2/settings.xml", + "subPath": "settings.xml" + } + ], + "name": "m2-secret-dir", + "secret": { + "name": "m2-secret-dir" + } + }, + { + "configMap": { + "name": "m2-dir" + }, + "mounts": [ + { + "mountPath": "/home/jenkins/.m2/toolchains.xml", + "subPath": "toolchains.xml" + }, + { + "mountPath": "/home/jenkins/.mavenrc", + "subPath": ".mavenrc" + } + ], + "name": "m2-dir" + } + ], + "yamlMergeStrategy": "merge" + }, + "labels": [ + "ubuntu-latest", + "ubuntu-2404" + ], + "maxHeap": "256m", + "mode": "EXCLUSIVE", + "name": "ubuntu-2404", + "remoting": { + "jar": "/usr/share/jenkins/agent.jar", + "startupScript": { + "name": "jenkins-agent", + "url": "https://github.com/jenkinsci/docker-agent/raw/3206.vb_15dcf73f6a_9-12/jenkins-agent", + "version": "3206.vb_15dcf73f6a_9-12" + }, + "url": "https://repo.jenkins-ci.org/public/org/jenkins-ci/main/remoting/3206.3208.v409508a_675ff/remoting-3206.3208.v409508a_675ff.jar", + "version": "3206.3208.v409508a_675ff" + }, + "startupScript": "/usr/local/bin/jenkins-agent", + "username": "jenkins" } } } @@ -753,6 +950,7 @@ }, "generate": false }, + "seLinuxLevel": "s0:c45,c5", "secrets": { "dockerconfigjson": { "dockerconfigjson-for-pull-as-default": { diff --git a/instances/ee4j.jstl/target/jenkins/configuration.yml b/instances/ee4j.jstl/target/jenkins/configuration.yml index 5f28a6656..9011c2f55 100644 --- a/instances/ee4j.jstl/target/jenkins/configuration.yml +++ b/instances/ee4j.jstl/target/jenkins/configuration.yml @@ -485,6 +485,188 @@ jenkins: name: m2-dir inheritYamlMergeStrategy: "true" yamlMergeStrategy: "merge" + - name: "ubuntu-2204" + namespace: "jstl" + label: "ubuntu-2204" + containers: + - name: "jnlp" + image: docker.io/eclipsecbi/jiro-agent-ubuntu-2204:remoting-3206.3208.v409508a_675ff + alwaysPullImage: true + livenessProbe: + failureThreshold: 0 + initialDelaySeconds: 0 + periodSeconds: 0 + successThreshold: 0 + timeoutSeconds: 0 + ttyEnabled: true + command: "" + args: "" + instanceCap: -1 + nodeUsageMode: EXCLUSIVE + envVars: + - envVar: + key: "JAVA_TOOL_OPTIONS" + 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" + - envVar: + key: "OPENJ9_JAVA_OPTIONS" + value: "-XX:+IgnoreUnrecognizedVMOptions -XX:+IdleTuningCompactOnIdle -XX:+IdleTuningGcOnIdle" + - envVar: + key: "_JAVA_OPTIONS" + value: "" + volumes: + - persistentVolumeClaim: + claimName: "tools-claim-jiro-jstl" + mountPath: "/opt/tools" + readOnly: true + - configMapVolume: + configMapName: "known-hosts" + mountPath: "/home/jenkins/.ssh/" + subPath: "." + - emptyDirVolume: + memory: false + mountPath: "/home/jenkins/" + - emptyDirVolume: + memory: false + mountPath: "/home/jenkins/.m2/repository" + - emptyDirVolume: + memory: false + mountPath: "/home/jenkins/.m2/wrapper" + workspaceVolume: + emptyDirWorkspaceVolume: + memory: false + yaml: | + apiVersion: v1 + kind: Pod + spec: + containers: + - name: jnlp + resources: + limits: + cpu: "2000m" + memory: "4096Mi" + requests: + cpu: "1000m" + memory: "4096Mi" + volumeMounts: + - name: m2-secret-dir + mountPath: /home/jenkins/.m2/settings-security.xml + subPath: settings-security.xml + readOnly: true + - name: m2-secret-dir + mountPath: /home/jenkins/.m2/settings.xml + subPath: settings.xml + readOnly: true + - name: m2-dir + mountPath: /home/jenkins/.m2/toolchains.xml + subPath: toolchains.xml + readOnly: true + - name: m2-dir + mountPath: /home/jenkins/.mavenrc + subPath: .mavenrc + readOnly: true + volumes: + - name: m2-secret-dir + secret: + secretName: m2-secret-dir + - name: m2-dir + configMap: + name: m2-dir + inheritYamlMergeStrategy: "true" + yamlMergeStrategy: "merge" + - name: "ubuntu-2404" + namespace: "jstl" + label: "ubuntu-latest ubuntu-2404" + containers: + - name: "jnlp" + image: docker.io/eclipsecbi/jiro-agent-ubuntu-2404:remoting-3206.3208.v409508a_675ff + alwaysPullImage: true + livenessProbe: + failureThreshold: 0 + initialDelaySeconds: 0 + periodSeconds: 0 + successThreshold: 0 + timeoutSeconds: 0 + ttyEnabled: true + command: "" + args: "" + instanceCap: -1 + nodeUsageMode: EXCLUSIVE + envVars: + - envVar: + key: "JAVA_TOOL_OPTIONS" + 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" + - envVar: + key: "OPENJ9_JAVA_OPTIONS" + value: "-XX:+IgnoreUnrecognizedVMOptions -XX:+IdleTuningCompactOnIdle -XX:+IdleTuningGcOnIdle" + - envVar: + key: "_JAVA_OPTIONS" + value: "" + volumes: + - persistentVolumeClaim: + claimName: "tools-claim-jiro-jstl" + mountPath: "/opt/tools" + readOnly: true + - configMapVolume: + configMapName: "known-hosts" + mountPath: "/home/jenkins/.ssh/" + subPath: "." + - emptyDirVolume: + memory: false + mountPath: "/home/jenkins/" + - emptyDirVolume: + memory: false + mountPath: "/home/jenkins/.m2/repository" + - emptyDirVolume: + memory: false + mountPath: "/home/jenkins/.m2/wrapper" + workspaceVolume: + emptyDirWorkspaceVolume: + memory: false + yaml: | + apiVersion: v1 + kind: Pod + spec: + containers: + - name: jnlp + resources: + limits: + cpu: "2000m" + memory: "4096Mi" + requests: + cpu: "1000m" + memory: "4096Mi" + volumeMounts: + - name: m2-secret-dir + mountPath: /home/jenkins/.m2/settings-security.xml + subPath: settings-security.xml + readOnly: true + - name: m2-secret-dir + mountPath: /home/jenkins/.m2/settings.xml + subPath: settings.xml + readOnly: true + - name: m2-dir + mountPath: /home/jenkins/.m2/toolchains.xml + subPath: toolchains.xml + readOnly: true + - name: m2-dir + mountPath: /home/jenkins/.mavenrc + subPath: .mavenrc + readOnly: true + volumes: + - name: m2-secret-dir + secret: + secretName: m2-secret-dir + - name: m2-dir + configMap: + name: m2-dir + inheritYamlMergeStrategy: "true" + yamlMergeStrategy: "merge" security: apiToken: creationOfLegacyTokenEnabled: false @@ -579,6 +761,8 @@ tool: home: "/opt/tools/java/openjdk/latest" - name: "openjdk-ea-latest" home: "/opt/tools/java/openjdk/ea-latest" + - name: "openjdk-jdk24-latest" + home: "/opt/tools/java/openjdk/jdk-24/latest" - name: "openjdk-jdk23-latest" home: "/opt/tools/java/openjdk/jdk-23/latest" - name: "openjdk-jdk22-latest" @@ -708,6 +892,8 @@ tool: installations: - name: "apache-maven-latest" home: "/opt/tools/apache-maven/latest" + - name: "apache-maven-3.9.9" + home: "/opt/tools/apache-maven/3.9.9" - name: "apache-maven-3.9.6" home: "/opt/tools/apache-maven/3.9.6" - name: "apache-maven-3.9.5" diff --git a/instances/ee4j.jstl/target/k8s/configmap-jenkins-config.yml b/instances/ee4j.jstl/target/k8s/configmap-jenkins-config.yml index 818af4a3f..12c46fc12 100644 --- a/instances/ee4j.jstl/target/k8s/configmap-jenkins-config.yml +++ b/instances/ee4j.jstl/target/k8s/configmap-jenkins-config.yml @@ -508,6 +508,188 @@ data: name: m2-dir inheritYamlMergeStrategy: "true" yamlMergeStrategy: "merge" + - name: "ubuntu-2204" + namespace: "jstl" + label: "ubuntu-2204" + containers: + - name: "jnlp" + image: docker.io/eclipsecbi/jiro-agent-ubuntu-2204:remoting-3206.3208.v409508a_675ff + alwaysPullImage: true + livenessProbe: + failureThreshold: 0 + initialDelaySeconds: 0 + periodSeconds: 0 + successThreshold: 0 + timeoutSeconds: 0 + ttyEnabled: true + command: "" + args: "" + instanceCap: -1 + nodeUsageMode: EXCLUSIVE + envVars: + - envVar: + key: "JAVA_TOOL_OPTIONS" + 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" + - envVar: + key: "OPENJ9_JAVA_OPTIONS" + value: "-XX:+IgnoreUnrecognizedVMOptions -XX:+IdleTuningCompactOnIdle -XX:+IdleTuningGcOnIdle" + - envVar: + key: "_JAVA_OPTIONS" + value: "" + volumes: + - persistentVolumeClaim: + claimName: "tools-claim-jiro-jstl" + mountPath: "/opt/tools" + readOnly: true + - configMapVolume: + configMapName: "known-hosts" + mountPath: "/home/jenkins/.ssh/" + subPath: "." + - emptyDirVolume: + memory: false + mountPath: "/home/jenkins/" + - emptyDirVolume: + memory: false + mountPath: "/home/jenkins/.m2/repository" + - emptyDirVolume: + memory: false + mountPath: "/home/jenkins/.m2/wrapper" + workspaceVolume: + emptyDirWorkspaceVolume: + memory: false + yaml: | + apiVersion: v1 + kind: Pod + spec: + containers: + - name: jnlp + resources: + limits: + cpu: "2000m" + memory: "4096Mi" + requests: + cpu: "1000m" + memory: "4096Mi" + volumeMounts: + - name: m2-secret-dir + mountPath: /home/jenkins/.m2/settings-security.xml + subPath: settings-security.xml + readOnly: true + - name: m2-secret-dir + mountPath: /home/jenkins/.m2/settings.xml + subPath: settings.xml + readOnly: true + - name: m2-dir + mountPath: /home/jenkins/.m2/toolchains.xml + subPath: toolchains.xml + readOnly: true + - name: m2-dir + mountPath: /home/jenkins/.mavenrc + subPath: .mavenrc + readOnly: true + volumes: + - name: m2-secret-dir + secret: + secretName: m2-secret-dir + - name: m2-dir + configMap: + name: m2-dir + inheritYamlMergeStrategy: "true" + yamlMergeStrategy: "merge" + - name: "ubuntu-2404" + namespace: "jstl" + label: "ubuntu-latest ubuntu-2404" + containers: + - name: "jnlp" + image: docker.io/eclipsecbi/jiro-agent-ubuntu-2404:remoting-3206.3208.v409508a_675ff + alwaysPullImage: true + livenessProbe: + failureThreshold: 0 + initialDelaySeconds: 0 + periodSeconds: 0 + successThreshold: 0 + timeoutSeconds: 0 + ttyEnabled: true + command: "" + args: "" + instanceCap: -1 + nodeUsageMode: EXCLUSIVE + envVars: + - envVar: + key: "JAVA_TOOL_OPTIONS" + 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" + - envVar: + key: "OPENJ9_JAVA_OPTIONS" + value: "-XX:+IgnoreUnrecognizedVMOptions -XX:+IdleTuningCompactOnIdle -XX:+IdleTuningGcOnIdle" + - envVar: + key: "_JAVA_OPTIONS" + value: "" + volumes: + - persistentVolumeClaim: + claimName: "tools-claim-jiro-jstl" + mountPath: "/opt/tools" + readOnly: true + - configMapVolume: + configMapName: "known-hosts" + mountPath: "/home/jenkins/.ssh/" + subPath: "." + - emptyDirVolume: + memory: false + mountPath: "/home/jenkins/" + - emptyDirVolume: + memory: false + mountPath: "/home/jenkins/.m2/repository" + - emptyDirVolume: + memory: false + mountPath: "/home/jenkins/.m2/wrapper" + workspaceVolume: + emptyDirWorkspaceVolume: + memory: false + yaml: | + apiVersion: v1 + kind: Pod + spec: + containers: + - name: jnlp + resources: + limits: + cpu: "2000m" + memory: "4096Mi" + requests: + cpu: "1000m" + memory: "4096Mi" + volumeMounts: + - name: m2-secret-dir + mountPath: /home/jenkins/.m2/settings-security.xml + subPath: settings-security.xml + readOnly: true + - name: m2-secret-dir + mountPath: /home/jenkins/.m2/settings.xml + subPath: settings.xml + readOnly: true + - name: m2-dir + mountPath: /home/jenkins/.m2/toolchains.xml + subPath: toolchains.xml + readOnly: true + - name: m2-dir + mountPath: /home/jenkins/.mavenrc + subPath: .mavenrc + readOnly: true + volumes: + - name: m2-secret-dir + secret: + secretName: m2-secret-dir + - name: m2-dir + configMap: + name: m2-dir + inheritYamlMergeStrategy: "true" + yamlMergeStrategy: "merge" security: apiToken: creationOfLegacyTokenEnabled: false @@ -602,6 +784,8 @@ data: home: "/opt/tools/java/openjdk/latest" - name: "openjdk-ea-latest" home: "/opt/tools/java/openjdk/ea-latest" + - name: "openjdk-jdk24-latest" + home: "/opt/tools/java/openjdk/jdk-24/latest" - name: "openjdk-jdk23-latest" home: "/opt/tools/java/openjdk/jdk-23/latest" - name: "openjdk-jdk22-latest" @@ -731,6 +915,8 @@ data: installations: - name: "apache-maven-latest" home: "/opt/tools/apache-maven/latest" + - name: "apache-maven-3.9.9" + home: "/opt/tools/apache-maven/3.9.9" - name: "apache-maven-3.9.6" home: "/opt/tools/apache-maven/3.9.6" - name: "apache-maven-3.9.5" diff --git a/instances/ee4j.jstl/target/k8s/m2-dir.json b/instances/ee4j.jstl/target/k8s/m2-dir.json index 75e6b8185..da140603d 100644 --- a/instances/ee4j.jstl/target/k8s/m2-dir.json +++ b/instances/ee4j.jstl/target/k8s/m2-dir.json @@ -2,7 +2,7 @@ "apiVersion": "v1", "data": { ".mavenrc": "set -- -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn --batch-mode \"${@}\"", - "toolchains.xml": "\n\n \n jdk\n \n JavaSE-1.8\n 1.8\n oracle\n \n /opt/tools/java/oracle/jdk-8/latest\n \n \n jdk\n \n JavaSE-9\n 9\n openjdk\n \n /opt/tools/java/openjdk/jdk-9/latest\n \n \n jdk\n \n JavaSE-10\n 10\n openjdk\n \n /opt/tools/java/openjdk/jdk-10/latest\n \n \n jdk\n \n JavaSE-11\n 11\n openjdk\n \n /opt/tools/java/openjdk/jdk-11/latest\n \n \n jdk\n \n JavaSE-12\n 12\n openjdk\n \n /opt/tools/java/openjdk/jdk-12/latest\n \n \n jdk\n \n JavaSE-13\n 13\n openjdk\n \n /opt/tools/java/openjdk/jdk-13/latest\n \n \n jdk\n \n JavaSE-14\n 14\n openjdk\n \n /opt/tools/java/openjdk/jdk-14/latest\n \n \n jdk\n \n JavaSE-15\n 15\n openjdk\n \n /opt/tools/java/openjdk/jdk-15/latest\n \n \n jdk\n \n JavaSE-16\n 16\n openjdk\n \n /opt/tools/java/openjdk/jdk-16/latest\n \n \n jdk\n \n JavaSE-17\n 17\n openjdk\n \n /opt/tools/java/openjdk/jdk-17/latest\n \n \n jdk\n \n JavaSE-18\n 18\n openjdk\n \n /opt/tools/java/openjdk/jdk-18/latest\n \n \n jdk\n \n JavaSE-19\n 19\n openjdk\n \n /opt/tools/java/openjdk/jdk-19/latest\n \n \n jdk\n \n JavaSE-20\n 20\n openjdk\n \n /opt/tools/java/openjdk/jdk-20/latest\n \n \n jdk\n \n JavaSE-21\n 21\n openjdk\n \n /opt/tools/java/openjdk/jdk-21/latest\n \n \n jdk\n \n JavaSE-22\n 22\n openjdk\n \n /opt/tools/java/openjdk/jdk-22/latest\n \n \n jdk\n \n JavaSE-23\n 23\n openjdk\n \n /opt/tools/java/openjdk/jdk-23/latest\n \n\n" + "toolchains.xml": "\n\n \n jdk\n \n JavaSE-1.8\n 1.8\n oracle\n \n /opt/tools/java/oracle/jdk-8/latest\n \n \n jdk\n \n JavaSE-9\n 9\n openjdk\n \n /opt/tools/java/openjdk/jdk-9/latest\n \n \n jdk\n \n JavaSE-10\n 10\n openjdk\n \n /opt/tools/java/openjdk/jdk-10/latest\n \n \n jdk\n \n JavaSE-11\n 11\n openjdk\n \n /opt/tools/java/openjdk/jdk-11/latest\n \n \n jdk\n \n JavaSE-12\n 12\n openjdk\n \n /opt/tools/java/openjdk/jdk-12/latest\n \n \n jdk\n \n JavaSE-13\n 13\n openjdk\n \n /opt/tools/java/openjdk/jdk-13/latest\n \n \n jdk\n \n JavaSE-14\n 14\n openjdk\n \n /opt/tools/java/openjdk/jdk-14/latest\n \n \n jdk\n \n JavaSE-15\n 15\n openjdk\n \n /opt/tools/java/openjdk/jdk-15/latest\n \n \n jdk\n \n JavaSE-16\n 16\n openjdk\n \n /opt/tools/java/openjdk/jdk-16/latest\n \n \n jdk\n \n JavaSE-17\n 17\n openjdk\n \n /opt/tools/java/openjdk/jdk-17/latest\n \n \n jdk\n \n JavaSE-18\n 18\n openjdk\n \n /opt/tools/java/openjdk/jdk-18/latest\n \n \n jdk\n \n JavaSE-19\n 19\n openjdk\n \n /opt/tools/java/openjdk/jdk-19/latest\n \n \n jdk\n \n JavaSE-20\n 20\n openjdk\n \n /opt/tools/java/openjdk/jdk-20/latest\n \n \n jdk\n \n JavaSE-21\n 21\n openjdk\n \n /opt/tools/java/openjdk/jdk-21/latest\n \n \n jdk\n \n JavaSE-22\n 22\n openjdk\n \n /opt/tools/java/openjdk/jdk-22/latest\n \n \n jdk\n \n JavaSE-23\n 23\n openjdk\n \n /opt/tools/java/openjdk/jdk-23/latest\n \n \n jdk\n \n JavaSE-24\n 24\n openjdk\n \n /opt/tools/java/openjdk/jdk-24/latest\n \n\n" }, "kind": "ConfigMap", "metadata": { diff --git a/instances/ee4j.jstl/target/k8s/statefulset.json b/instances/ee4j.jstl/target/k8s/statefulset.json index 866288a11..e49cd51d8 100644 --- a/instances/ee4j.jstl/target/k8s/statefulset.json +++ b/instances/ee4j.jstl/target/k8s/statefulset.json @@ -119,6 +119,12 @@ "cpu": "250m" } }, + "securityContext": { + "seLinuxOptions": { + "level": "s0:c45,c5", + "type": "spc_t" + } + }, "volumeMounts": [ { "mountPath": "/var/jenkins", diff --git a/instances/ee4j.messaging/config.jsonnet b/instances/ee4j.messaging/config.jsonnet index 33d79fed7..1109a9240 100644 --- a/instances/ee4j.messaging/config.jsonnet +++ b/instances/ee4j.messaging/config.jsonnet @@ -3,4 +3,5 @@ fullName: "ee4j.messaging", displayName: "Jakarta Messaging", }, + seLinuxLevel: "s0:c48,c2", } diff --git a/instances/ee4j.messaging/target/config.json b/instances/ee4j.messaging/target/config.json index a7dcb04c4..33e6030e2 100644 --- a/instances/ee4j.messaging/target/config.json +++ b/instances/ee4j.messaging/target/config.json @@ -217,7 +217,7 @@ "docker.io/eclipsecbi/jiro-agent-centos-7:latest" ], "context": "centos-7", - "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-centos-7: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 [ \"uid_entrypoint\", \"/usr/local/bin/jenkins-agent\" ]\n\nADD \"https://repo.jenkins-ci.org/public/org/jenkins-ci/main/remoting/3206.3208.v409508a_675ff/remoting-3206.3208.v409508a_675ff.jar\" \"/usr/share/jenkins/agent.jar\" \nADD \"https://github.com/jenkinsci/docker-agent/raw/3206.vb_15dcf73f6a_9-12/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\nUSER 10001:0\n", + "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-centos-7: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/3206.3208.v409508a_675ff/remoting-3206.3208.v409508a_675ff.jar\" \"/usr/share/jenkins/agent.jar\"\nADD \"https://github.com/jenkinsci/docker-agent/raw/3206.vb_15dcf73f6a_9-12/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\nUSER 10001:0\n", "image": "jiro-agent-centos-7", "registry": "docker.io", "repository": "eclipsecbi", @@ -316,7 +316,7 @@ "docker.io/eclipsecbi/jiro-agent-centos-8:latest" ], "context": "centos-8", - "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-centos-8: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 [ \"uid_entrypoint\", \"/usr/local/bin/jenkins-agent\" ]\n\nADD \"https://repo.jenkins-ci.org/public/org/jenkins-ci/main/remoting/3206.3208.v409508a_675ff/remoting-3206.3208.v409508a_675ff.jar\" \"/usr/share/jenkins/agent.jar\" \nADD \"https://github.com/jenkinsci/docker-agent/raw/3206.vb_15dcf73f6a_9-12/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\nUSER 10001:0\n", + "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-centos-8: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/3206.3208.v409508a_675ff/remoting-3206.3208.v409508a_675ff.jar\" \"/usr/share/jenkins/agent.jar\"\nADD \"https://github.com/jenkinsci/docker-agent/raw/3206.vb_15dcf73f6a_9-12/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\nUSER 10001:0\n", "image": "jiro-agent-centos-8", "registry": "docker.io", "repository": "eclipsecbi", @@ -406,6 +406,203 @@ }, "startupScript": "/usr/local/bin/jenkins-agent", "username": "jenkins" + }, + "ubuntu-2204": { + "agentWorkdir": "/home/jenkins/jenkins-agent", + "docker": { + "aliases": [ + "docker.io/eclipsecbi/jiro-agent-ubuntu-2204:latest" + ], + "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-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/3206.3208.v409508a_675ff/remoting-3206.3208.v409508a_675ff.jar\" \"/usr/share/jenkins/agent.jar\"\nADD \"https://github.com/jenkinsci/docker-agent/raw/3206.vb_15dcf73f6a_9-12/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\nUSER 10001:0\n", + "image": "jiro-agent-ubuntu-2204", + "registry": "docker.io", + "repository": "eclipsecbi", + "tag": "remoting-3206.3208.v409508a_675ff" + }, + "env": { + "JAVA_TOOL_OPTIONS": [ ], + "JENKINS_REMOTING_JAVA_OPTS": [ + "-showversion", + "-XshowSettings:vm", + "-Xmx256m", + "-Dorg.jenkinsci.remoting.engine.JnlpProtocol3.disabled=true", + "-Dorg.jenkinsci.plugins.gitclient.CliGitAPIImpl.useSETSID=true" + ], + "OPENJ9_JAVA_OPTIONS": [ + "-XX:+IgnoreUnrecognizedVMOptions", + "-XX:+IdleTuningCompactOnIdle", + "-XX:+IdleTuningGcOnIdle" + ], + "_JAVA_OPTIONS": [ ] + }, + "home": "/home/jenkins", + "kubernetes": { + "inheritYamlMergeStrategy": true, + "resources": { + "cpu": { + "limit": "2000m", + "request": "1000m" + }, + "memory": { + "limit": "4096Mi", + "request": "4096Mi" + } + }, + "volumes": [ + { + "mounts": [ + { + "mountPath": "/home/jenkins/.m2/settings-security.xml", + "subPath": "settings-security.xml" + }, + { + "mountPath": "/home/jenkins/.m2/settings.xml", + "subPath": "settings.xml" + } + ], + "name": "m2-secret-dir", + "secret": { + "name": "m2-secret-dir" + } + }, + { + "configMap": { + "name": "m2-dir" + }, + "mounts": [ + { + "mountPath": "/home/jenkins/.m2/toolchains.xml", + "subPath": "toolchains.xml" + }, + { + "mountPath": "/home/jenkins/.mavenrc", + "subPath": ".mavenrc" + } + ], + "name": "m2-dir" + } + ], + "yamlMergeStrategy": "merge" + }, + "labels": [ + "ubuntu-2204" + ], + "maxHeap": "256m", + "mode": "EXCLUSIVE", + "name": "ubuntu-2204", + "remoting": { + "jar": "/usr/share/jenkins/agent.jar", + "startupScript": { + "name": "jenkins-agent", + "url": "https://github.com/jenkinsci/docker-agent/raw/3206.vb_15dcf73f6a_9-12/jenkins-agent", + "version": "3206.vb_15dcf73f6a_9-12" + }, + "url": "https://repo.jenkins-ci.org/public/org/jenkins-ci/main/remoting/3206.3208.v409508a_675ff/remoting-3206.3208.v409508a_675ff.jar", + "version": "3206.3208.v409508a_675ff" + }, + "startupScript": "/usr/local/bin/jenkins-agent", + "username": "jenkins" + }, + "ubuntu-2404": { + "agentWorkdir": "/home/jenkins/jenkins-agent", + "docker": { + "aliases": [ + "docker.io/eclipsecbi/jiro-agent-ubuntu-2404:latest" + ], + "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-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/3206.3208.v409508a_675ff/remoting-3206.3208.v409508a_675ff.jar\" \"/usr/share/jenkins/agent.jar\"\nADD \"https://github.com/jenkinsci/docker-agent/raw/3206.vb_15dcf73f6a_9-12/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\nUSER 10001:0\n", + "image": "jiro-agent-ubuntu-2404", + "registry": "docker.io", + "repository": "eclipsecbi", + "tag": "remoting-3206.3208.v409508a_675ff" + }, + "env": { + "JAVA_TOOL_OPTIONS": [ ], + "JENKINS_REMOTING_JAVA_OPTS": [ + "-showversion", + "-XshowSettings:vm", + "-Xmx256m", + "-Dorg.jenkinsci.remoting.engine.JnlpProtocol3.disabled=true", + "-Dorg.jenkinsci.plugins.gitclient.CliGitAPIImpl.useSETSID=true" + ], + "OPENJ9_JAVA_OPTIONS": [ + "-XX:+IgnoreUnrecognizedVMOptions", + "-XX:+IdleTuningCompactOnIdle", + "-XX:+IdleTuningGcOnIdle" + ], + "_JAVA_OPTIONS": [ ] + }, + "home": "/home/jenkins", + "kubernetes": { + "inheritYamlMergeStrategy": true, + "resources": { + "cpu": { + "limit": "2000m", + "request": "1000m" + }, + "memory": { + "limit": "4096Mi", + "request": "4096Mi" + } + }, + "volumes": [ + { + "mounts": [ + { + "mountPath": "/home/jenkins/.m2/settings-security.xml", + "subPath": "settings-security.xml" + }, + { + "mountPath": "/home/jenkins/.m2/settings.xml", + "subPath": "settings.xml" + } + ], + "name": "m2-secret-dir", + "secret": { + "name": "m2-secret-dir" + } + }, + { + "configMap": { + "name": "m2-dir" + }, + "mounts": [ + { + "mountPath": "/home/jenkins/.m2/toolchains.xml", + "subPath": "toolchains.xml" + }, + { + "mountPath": "/home/jenkins/.mavenrc", + "subPath": ".mavenrc" + } + ], + "name": "m2-dir" + } + ], + "yamlMergeStrategy": "merge" + }, + "labels": [ + "ubuntu-latest", + "ubuntu-2404" + ], + "maxHeap": "256m", + "mode": "EXCLUSIVE", + "name": "ubuntu-2404", + "remoting": { + "jar": "/usr/share/jenkins/agent.jar", + "startupScript": { + "name": "jenkins-agent", + "url": "https://github.com/jenkinsci/docker-agent/raw/3206.vb_15dcf73f6a_9-12/jenkins-agent", + "version": "3206.vb_15dcf73f6a_9-12" + }, + "url": "https://repo.jenkins-ci.org/public/org/jenkins-ci/main/remoting/3206.3208.v409508a_675ff/remoting-3206.3208.v409508a_675ff.jar", + "version": "3206.3208.v409508a_675ff" + }, + "startupScript": "/usr/local/bin/jenkins-agent", + "username": "jenkins" } } } @@ -753,6 +950,7 @@ }, "generate": false }, + "seLinuxLevel": "s0:c48,c2", "secrets": { "dockerconfigjson": { "dockerconfigjson-for-pull-as-default": { diff --git a/instances/ee4j.messaging/target/jenkins/configuration.yml b/instances/ee4j.messaging/target/jenkins/configuration.yml index 6e563d9dd..44b6a4190 100644 --- a/instances/ee4j.messaging/target/jenkins/configuration.yml +++ b/instances/ee4j.messaging/target/jenkins/configuration.yml @@ -485,6 +485,188 @@ jenkins: name: m2-dir inheritYamlMergeStrategy: "true" yamlMergeStrategy: "merge" + - name: "ubuntu-2204" + namespace: "messaging" + label: "ubuntu-2204" + containers: + - name: "jnlp" + image: docker.io/eclipsecbi/jiro-agent-ubuntu-2204:remoting-3206.3208.v409508a_675ff + alwaysPullImage: true + livenessProbe: + failureThreshold: 0 + initialDelaySeconds: 0 + periodSeconds: 0 + successThreshold: 0 + timeoutSeconds: 0 + ttyEnabled: true + command: "" + args: "" + instanceCap: -1 + nodeUsageMode: EXCLUSIVE + envVars: + - envVar: + key: "JAVA_TOOL_OPTIONS" + 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" + - envVar: + key: "OPENJ9_JAVA_OPTIONS" + value: "-XX:+IgnoreUnrecognizedVMOptions -XX:+IdleTuningCompactOnIdle -XX:+IdleTuningGcOnIdle" + - envVar: + key: "_JAVA_OPTIONS" + value: "" + volumes: + - persistentVolumeClaim: + claimName: "tools-claim-jiro-messaging" + mountPath: "/opt/tools" + readOnly: true + - configMapVolume: + configMapName: "known-hosts" + mountPath: "/home/jenkins/.ssh/" + subPath: "." + - emptyDirVolume: + memory: false + mountPath: "/home/jenkins/" + - emptyDirVolume: + memory: false + mountPath: "/home/jenkins/.m2/repository" + - emptyDirVolume: + memory: false + mountPath: "/home/jenkins/.m2/wrapper" + workspaceVolume: + emptyDirWorkspaceVolume: + memory: false + yaml: | + apiVersion: v1 + kind: Pod + spec: + containers: + - name: jnlp + resources: + limits: + cpu: "2000m" + memory: "4096Mi" + requests: + cpu: "1000m" + memory: "4096Mi" + volumeMounts: + - name: m2-secret-dir + mountPath: /home/jenkins/.m2/settings-security.xml + subPath: settings-security.xml + readOnly: true + - name: m2-secret-dir + mountPath: /home/jenkins/.m2/settings.xml + subPath: settings.xml + readOnly: true + - name: m2-dir + mountPath: /home/jenkins/.m2/toolchains.xml + subPath: toolchains.xml + readOnly: true + - name: m2-dir + mountPath: /home/jenkins/.mavenrc + subPath: .mavenrc + readOnly: true + volumes: + - name: m2-secret-dir + secret: + secretName: m2-secret-dir + - name: m2-dir + configMap: + name: m2-dir + inheritYamlMergeStrategy: "true" + yamlMergeStrategy: "merge" + - name: "ubuntu-2404" + namespace: "messaging" + label: "ubuntu-latest ubuntu-2404" + containers: + - name: "jnlp" + image: docker.io/eclipsecbi/jiro-agent-ubuntu-2404:remoting-3206.3208.v409508a_675ff + alwaysPullImage: true + livenessProbe: + failureThreshold: 0 + initialDelaySeconds: 0 + periodSeconds: 0 + successThreshold: 0 + timeoutSeconds: 0 + ttyEnabled: true + command: "" + args: "" + instanceCap: -1 + nodeUsageMode: EXCLUSIVE + envVars: + - envVar: + key: "JAVA_TOOL_OPTIONS" + 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" + - envVar: + key: "OPENJ9_JAVA_OPTIONS" + value: "-XX:+IgnoreUnrecognizedVMOptions -XX:+IdleTuningCompactOnIdle -XX:+IdleTuningGcOnIdle" + - envVar: + key: "_JAVA_OPTIONS" + value: "" + volumes: + - persistentVolumeClaim: + claimName: "tools-claim-jiro-messaging" + mountPath: "/opt/tools" + readOnly: true + - configMapVolume: + configMapName: "known-hosts" + mountPath: "/home/jenkins/.ssh/" + subPath: "." + - emptyDirVolume: + memory: false + mountPath: "/home/jenkins/" + - emptyDirVolume: + memory: false + mountPath: "/home/jenkins/.m2/repository" + - emptyDirVolume: + memory: false + mountPath: "/home/jenkins/.m2/wrapper" + workspaceVolume: + emptyDirWorkspaceVolume: + memory: false + yaml: | + apiVersion: v1 + kind: Pod + spec: + containers: + - name: jnlp + resources: + limits: + cpu: "2000m" + memory: "4096Mi" + requests: + cpu: "1000m" + memory: "4096Mi" + volumeMounts: + - name: m2-secret-dir + mountPath: /home/jenkins/.m2/settings-security.xml + subPath: settings-security.xml + readOnly: true + - name: m2-secret-dir + mountPath: /home/jenkins/.m2/settings.xml + subPath: settings.xml + readOnly: true + - name: m2-dir + mountPath: /home/jenkins/.m2/toolchains.xml + subPath: toolchains.xml + readOnly: true + - name: m2-dir + mountPath: /home/jenkins/.mavenrc + subPath: .mavenrc + readOnly: true + volumes: + - name: m2-secret-dir + secret: + secretName: m2-secret-dir + - name: m2-dir + configMap: + name: m2-dir + inheritYamlMergeStrategy: "true" + yamlMergeStrategy: "merge" security: apiToken: creationOfLegacyTokenEnabled: false @@ -579,6 +761,8 @@ tool: home: "/opt/tools/java/openjdk/latest" - name: "openjdk-ea-latest" home: "/opt/tools/java/openjdk/ea-latest" + - name: "openjdk-jdk24-latest" + home: "/opt/tools/java/openjdk/jdk-24/latest" - name: "openjdk-jdk23-latest" home: "/opt/tools/java/openjdk/jdk-23/latest" - name: "openjdk-jdk22-latest" @@ -708,6 +892,8 @@ tool: installations: - name: "apache-maven-latest" home: "/opt/tools/apache-maven/latest" + - name: "apache-maven-3.9.9" + home: "/opt/tools/apache-maven/3.9.9" - name: "apache-maven-3.9.6" home: "/opt/tools/apache-maven/3.9.6" - name: "apache-maven-3.9.5" diff --git a/instances/ee4j.messaging/target/k8s/configmap-jenkins-config.yml b/instances/ee4j.messaging/target/k8s/configmap-jenkins-config.yml index 44a507ea2..c994d365e 100644 --- a/instances/ee4j.messaging/target/k8s/configmap-jenkins-config.yml +++ b/instances/ee4j.messaging/target/k8s/configmap-jenkins-config.yml @@ -508,6 +508,188 @@ data: name: m2-dir inheritYamlMergeStrategy: "true" yamlMergeStrategy: "merge" + - name: "ubuntu-2204" + namespace: "messaging" + label: "ubuntu-2204" + containers: + - name: "jnlp" + image: docker.io/eclipsecbi/jiro-agent-ubuntu-2204:remoting-3206.3208.v409508a_675ff + alwaysPullImage: true + livenessProbe: + failureThreshold: 0 + initialDelaySeconds: 0 + periodSeconds: 0 + successThreshold: 0 + timeoutSeconds: 0 + ttyEnabled: true + command: "" + args: "" + instanceCap: -1 + nodeUsageMode: EXCLUSIVE + envVars: + - envVar: + key: "JAVA_TOOL_OPTIONS" + 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" + - envVar: + key: "OPENJ9_JAVA_OPTIONS" + value: "-XX:+IgnoreUnrecognizedVMOptions -XX:+IdleTuningCompactOnIdle -XX:+IdleTuningGcOnIdle" + - envVar: + key: "_JAVA_OPTIONS" + value: "" + volumes: + - persistentVolumeClaim: + claimName: "tools-claim-jiro-messaging" + mountPath: "/opt/tools" + readOnly: true + - configMapVolume: + configMapName: "known-hosts" + mountPath: "/home/jenkins/.ssh/" + subPath: "." + - emptyDirVolume: + memory: false + mountPath: "/home/jenkins/" + - emptyDirVolume: + memory: false + mountPath: "/home/jenkins/.m2/repository" + - emptyDirVolume: + memory: false + mountPath: "/home/jenkins/.m2/wrapper" + workspaceVolume: + emptyDirWorkspaceVolume: + memory: false + yaml: | + apiVersion: v1 + kind: Pod + spec: + containers: + - name: jnlp + resources: + limits: + cpu: "2000m" + memory: "4096Mi" + requests: + cpu: "1000m" + memory: "4096Mi" + volumeMounts: + - name: m2-secret-dir + mountPath: /home/jenkins/.m2/settings-security.xml + subPath: settings-security.xml + readOnly: true + - name: m2-secret-dir + mountPath: /home/jenkins/.m2/settings.xml + subPath: settings.xml + readOnly: true + - name: m2-dir + mountPath: /home/jenkins/.m2/toolchains.xml + subPath: toolchains.xml + readOnly: true + - name: m2-dir + mountPath: /home/jenkins/.mavenrc + subPath: .mavenrc + readOnly: true + volumes: + - name: m2-secret-dir + secret: + secretName: m2-secret-dir + - name: m2-dir + configMap: + name: m2-dir + inheritYamlMergeStrategy: "true" + yamlMergeStrategy: "merge" + - name: "ubuntu-2404" + namespace: "messaging" + label: "ubuntu-latest ubuntu-2404" + containers: + - name: "jnlp" + image: docker.io/eclipsecbi/jiro-agent-ubuntu-2404:remoting-3206.3208.v409508a_675ff + alwaysPullImage: true + livenessProbe: + failureThreshold: 0 + initialDelaySeconds: 0 + periodSeconds: 0 + successThreshold: 0 + timeoutSeconds: 0 + ttyEnabled: true + command: "" + args: "" + instanceCap: -1 + nodeUsageMode: EXCLUSIVE + envVars: + - envVar: + key: "JAVA_TOOL_OPTIONS" + 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" + - envVar: + key: "OPENJ9_JAVA_OPTIONS" + value: "-XX:+IgnoreUnrecognizedVMOptions -XX:+IdleTuningCompactOnIdle -XX:+IdleTuningGcOnIdle" + - envVar: + key: "_JAVA_OPTIONS" + value: "" + volumes: + - persistentVolumeClaim: + claimName: "tools-claim-jiro-messaging" + mountPath: "/opt/tools" + readOnly: true + - configMapVolume: + configMapName: "known-hosts" + mountPath: "/home/jenkins/.ssh/" + subPath: "." + - emptyDirVolume: + memory: false + mountPath: "/home/jenkins/" + - emptyDirVolume: + memory: false + mountPath: "/home/jenkins/.m2/repository" + - emptyDirVolume: + memory: false + mountPath: "/home/jenkins/.m2/wrapper" + workspaceVolume: + emptyDirWorkspaceVolume: + memory: false + yaml: | + apiVersion: v1 + kind: Pod + spec: + containers: + - name: jnlp + resources: + limits: + cpu: "2000m" + memory: "4096Mi" + requests: + cpu: "1000m" + memory: "4096Mi" + volumeMounts: + - name: m2-secret-dir + mountPath: /home/jenkins/.m2/settings-security.xml + subPath: settings-security.xml + readOnly: true + - name: m2-secret-dir + mountPath: /home/jenkins/.m2/settings.xml + subPath: settings.xml + readOnly: true + - name: m2-dir + mountPath: /home/jenkins/.m2/toolchains.xml + subPath: toolchains.xml + readOnly: true + - name: m2-dir + mountPath: /home/jenkins/.mavenrc + subPath: .mavenrc + readOnly: true + volumes: + - name: m2-secret-dir + secret: + secretName: m2-secret-dir + - name: m2-dir + configMap: + name: m2-dir + inheritYamlMergeStrategy: "true" + yamlMergeStrategy: "merge" security: apiToken: creationOfLegacyTokenEnabled: false @@ -602,6 +784,8 @@ data: home: "/opt/tools/java/openjdk/latest" - name: "openjdk-ea-latest" home: "/opt/tools/java/openjdk/ea-latest" + - name: "openjdk-jdk24-latest" + home: "/opt/tools/java/openjdk/jdk-24/latest" - name: "openjdk-jdk23-latest" home: "/opt/tools/java/openjdk/jdk-23/latest" - name: "openjdk-jdk22-latest" @@ -731,6 +915,8 @@ data: installations: - name: "apache-maven-latest" home: "/opt/tools/apache-maven/latest" + - name: "apache-maven-3.9.9" + home: "/opt/tools/apache-maven/3.9.9" - name: "apache-maven-3.9.6" home: "/opt/tools/apache-maven/3.9.6" - name: "apache-maven-3.9.5" diff --git a/instances/ee4j.messaging/target/k8s/m2-dir.json b/instances/ee4j.messaging/target/k8s/m2-dir.json index ff71239ab..a4e7fa1e8 100644 --- a/instances/ee4j.messaging/target/k8s/m2-dir.json +++ b/instances/ee4j.messaging/target/k8s/m2-dir.json @@ -2,7 +2,7 @@ "apiVersion": "v1", "data": { ".mavenrc": "set -- -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn --batch-mode \"${@}\"", - "toolchains.xml": "\n\n \n jdk\n \n JavaSE-1.8\n 1.8\n oracle\n \n /opt/tools/java/oracle/jdk-8/latest\n \n \n jdk\n \n JavaSE-9\n 9\n openjdk\n \n /opt/tools/java/openjdk/jdk-9/latest\n \n \n jdk\n \n JavaSE-10\n 10\n openjdk\n \n /opt/tools/java/openjdk/jdk-10/latest\n \n \n jdk\n \n JavaSE-11\n 11\n openjdk\n \n /opt/tools/java/openjdk/jdk-11/latest\n \n \n jdk\n \n JavaSE-12\n 12\n openjdk\n \n /opt/tools/java/openjdk/jdk-12/latest\n \n \n jdk\n \n JavaSE-13\n 13\n openjdk\n \n /opt/tools/java/openjdk/jdk-13/latest\n \n \n jdk\n \n JavaSE-14\n 14\n openjdk\n \n /opt/tools/java/openjdk/jdk-14/latest\n \n \n jdk\n \n JavaSE-15\n 15\n openjdk\n \n /opt/tools/java/openjdk/jdk-15/latest\n \n \n jdk\n \n JavaSE-16\n 16\n openjdk\n \n /opt/tools/java/openjdk/jdk-16/latest\n \n \n jdk\n \n JavaSE-17\n 17\n openjdk\n \n /opt/tools/java/openjdk/jdk-17/latest\n \n \n jdk\n \n JavaSE-18\n 18\n openjdk\n \n /opt/tools/java/openjdk/jdk-18/latest\n \n \n jdk\n \n JavaSE-19\n 19\n openjdk\n \n /opt/tools/java/openjdk/jdk-19/latest\n \n \n jdk\n \n JavaSE-20\n 20\n openjdk\n \n /opt/tools/java/openjdk/jdk-20/latest\n \n \n jdk\n \n JavaSE-21\n 21\n openjdk\n \n /opt/tools/java/openjdk/jdk-21/latest\n \n \n jdk\n \n JavaSE-22\n 22\n openjdk\n \n /opt/tools/java/openjdk/jdk-22/latest\n \n \n jdk\n \n JavaSE-23\n 23\n openjdk\n \n /opt/tools/java/openjdk/jdk-23/latest\n \n\n" + "toolchains.xml": "\n\n \n jdk\n \n JavaSE-1.8\n 1.8\n oracle\n \n /opt/tools/java/oracle/jdk-8/latest\n \n \n jdk\n \n JavaSE-9\n 9\n openjdk\n \n /opt/tools/java/openjdk/jdk-9/latest\n \n \n jdk\n \n JavaSE-10\n 10\n openjdk\n \n /opt/tools/java/openjdk/jdk-10/latest\n \n \n jdk\n \n JavaSE-11\n 11\n openjdk\n \n /opt/tools/java/openjdk/jdk-11/latest\n \n \n jdk\n \n JavaSE-12\n 12\n openjdk\n \n /opt/tools/java/openjdk/jdk-12/latest\n \n \n jdk\n \n JavaSE-13\n 13\n openjdk\n \n /opt/tools/java/openjdk/jdk-13/latest\n \n \n jdk\n \n JavaSE-14\n 14\n openjdk\n \n /opt/tools/java/openjdk/jdk-14/latest\n \n \n jdk\n \n JavaSE-15\n 15\n openjdk\n \n /opt/tools/java/openjdk/jdk-15/latest\n \n \n jdk\n \n JavaSE-16\n 16\n openjdk\n \n /opt/tools/java/openjdk/jdk-16/latest\n \n \n jdk\n \n JavaSE-17\n 17\n openjdk\n \n /opt/tools/java/openjdk/jdk-17/latest\n \n \n jdk\n \n JavaSE-18\n 18\n openjdk\n \n /opt/tools/java/openjdk/jdk-18/latest\n \n \n jdk\n \n JavaSE-19\n 19\n openjdk\n \n /opt/tools/java/openjdk/jdk-19/latest\n \n \n jdk\n \n JavaSE-20\n 20\n openjdk\n \n /opt/tools/java/openjdk/jdk-20/latest\n \n \n jdk\n \n JavaSE-21\n 21\n openjdk\n \n /opt/tools/java/openjdk/jdk-21/latest\n \n \n jdk\n \n JavaSE-22\n 22\n openjdk\n \n /opt/tools/java/openjdk/jdk-22/latest\n \n \n jdk\n \n JavaSE-23\n 23\n openjdk\n \n /opt/tools/java/openjdk/jdk-23/latest\n \n \n jdk\n \n JavaSE-24\n 24\n openjdk\n \n /opt/tools/java/openjdk/jdk-24/latest\n \n\n" }, "kind": "ConfigMap", "metadata": { diff --git a/instances/ee4j.messaging/target/k8s/statefulset.json b/instances/ee4j.messaging/target/k8s/statefulset.json index 90eba8d27..ab0630a96 100644 --- a/instances/ee4j.messaging/target/k8s/statefulset.json +++ b/instances/ee4j.messaging/target/k8s/statefulset.json @@ -119,6 +119,12 @@ "cpu": "250m" } }, + "securityContext": { + "seLinuxOptions": { + "level": "s0:c48,c2", + "type": "spc_t" + } + }, "volumeMounts": [ { "mountPath": "/var/jenkins", diff --git a/instances/ee4j.mvc/config.jsonnet b/instances/ee4j.mvc/config.jsonnet index 807f085b1..f29e5fef3 100644 --- a/instances/ee4j.mvc/config.jsonnet +++ b/instances/ee4j.mvc/config.jsonnet @@ -3,4 +3,5 @@ fullName: "ee4j.mvc", displayName: "Jakarta MVC", }, + seLinuxLevel: "s0:c48,c42", } diff --git a/instances/ee4j.mvc/target/config.json b/instances/ee4j.mvc/target/config.json index 4e0589159..99c31df38 100644 --- a/instances/ee4j.mvc/target/config.json +++ b/instances/ee4j.mvc/target/config.json @@ -217,7 +217,7 @@ "docker.io/eclipsecbi/jiro-agent-centos-7:latest" ], "context": "centos-7", - "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-centos-7: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 [ \"uid_entrypoint\", \"/usr/local/bin/jenkins-agent\" ]\n\nADD \"https://repo.jenkins-ci.org/public/org/jenkins-ci/main/remoting/3206.3208.v409508a_675ff/remoting-3206.3208.v409508a_675ff.jar\" \"/usr/share/jenkins/agent.jar\" \nADD \"https://github.com/jenkinsci/docker-agent/raw/3206.vb_15dcf73f6a_9-12/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\nUSER 10001:0\n", + "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-centos-7: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/3206.3208.v409508a_675ff/remoting-3206.3208.v409508a_675ff.jar\" \"/usr/share/jenkins/agent.jar\"\nADD \"https://github.com/jenkinsci/docker-agent/raw/3206.vb_15dcf73f6a_9-12/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\nUSER 10001:0\n", "image": "jiro-agent-centos-7", "registry": "docker.io", "repository": "eclipsecbi", @@ -316,7 +316,7 @@ "docker.io/eclipsecbi/jiro-agent-centos-8:latest" ], "context": "centos-8", - "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-centos-8: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 [ \"uid_entrypoint\", \"/usr/local/bin/jenkins-agent\" ]\n\nADD \"https://repo.jenkins-ci.org/public/org/jenkins-ci/main/remoting/3206.3208.v409508a_675ff/remoting-3206.3208.v409508a_675ff.jar\" \"/usr/share/jenkins/agent.jar\" \nADD \"https://github.com/jenkinsci/docker-agent/raw/3206.vb_15dcf73f6a_9-12/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\nUSER 10001:0\n", + "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-centos-8: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/3206.3208.v409508a_675ff/remoting-3206.3208.v409508a_675ff.jar\" \"/usr/share/jenkins/agent.jar\"\nADD \"https://github.com/jenkinsci/docker-agent/raw/3206.vb_15dcf73f6a_9-12/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\nUSER 10001:0\n", "image": "jiro-agent-centos-8", "registry": "docker.io", "repository": "eclipsecbi", @@ -406,6 +406,203 @@ }, "startupScript": "/usr/local/bin/jenkins-agent", "username": "jenkins" + }, + "ubuntu-2204": { + "agentWorkdir": "/home/jenkins/jenkins-agent", + "docker": { + "aliases": [ + "docker.io/eclipsecbi/jiro-agent-ubuntu-2204:latest" + ], + "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-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/3206.3208.v409508a_675ff/remoting-3206.3208.v409508a_675ff.jar\" \"/usr/share/jenkins/agent.jar\"\nADD \"https://github.com/jenkinsci/docker-agent/raw/3206.vb_15dcf73f6a_9-12/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\nUSER 10001:0\n", + "image": "jiro-agent-ubuntu-2204", + "registry": "docker.io", + "repository": "eclipsecbi", + "tag": "remoting-3206.3208.v409508a_675ff" + }, + "env": { + "JAVA_TOOL_OPTIONS": [ ], + "JENKINS_REMOTING_JAVA_OPTS": [ + "-showversion", + "-XshowSettings:vm", + "-Xmx256m", + "-Dorg.jenkinsci.remoting.engine.JnlpProtocol3.disabled=true", + "-Dorg.jenkinsci.plugins.gitclient.CliGitAPIImpl.useSETSID=true" + ], + "OPENJ9_JAVA_OPTIONS": [ + "-XX:+IgnoreUnrecognizedVMOptions", + "-XX:+IdleTuningCompactOnIdle", + "-XX:+IdleTuningGcOnIdle" + ], + "_JAVA_OPTIONS": [ ] + }, + "home": "/home/jenkins", + "kubernetes": { + "inheritYamlMergeStrategy": true, + "resources": { + "cpu": { + "limit": "2000m", + "request": "1000m" + }, + "memory": { + "limit": "4096Mi", + "request": "4096Mi" + } + }, + "volumes": [ + { + "mounts": [ + { + "mountPath": "/home/jenkins/.m2/settings-security.xml", + "subPath": "settings-security.xml" + }, + { + "mountPath": "/home/jenkins/.m2/settings.xml", + "subPath": "settings.xml" + } + ], + "name": "m2-secret-dir", + "secret": { + "name": "m2-secret-dir" + } + }, + { + "configMap": { + "name": "m2-dir" + }, + "mounts": [ + { + "mountPath": "/home/jenkins/.m2/toolchains.xml", + "subPath": "toolchains.xml" + }, + { + "mountPath": "/home/jenkins/.mavenrc", + "subPath": ".mavenrc" + } + ], + "name": "m2-dir" + } + ], + "yamlMergeStrategy": "merge" + }, + "labels": [ + "ubuntu-2204" + ], + "maxHeap": "256m", + "mode": "EXCLUSIVE", + "name": "ubuntu-2204", + "remoting": { + "jar": "/usr/share/jenkins/agent.jar", + "startupScript": { + "name": "jenkins-agent", + "url": "https://github.com/jenkinsci/docker-agent/raw/3206.vb_15dcf73f6a_9-12/jenkins-agent", + "version": "3206.vb_15dcf73f6a_9-12" + }, + "url": "https://repo.jenkins-ci.org/public/org/jenkins-ci/main/remoting/3206.3208.v409508a_675ff/remoting-3206.3208.v409508a_675ff.jar", + "version": "3206.3208.v409508a_675ff" + }, + "startupScript": "/usr/local/bin/jenkins-agent", + "username": "jenkins" + }, + "ubuntu-2404": { + "agentWorkdir": "/home/jenkins/jenkins-agent", + "docker": { + "aliases": [ + "docker.io/eclipsecbi/jiro-agent-ubuntu-2404:latest" + ], + "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-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/3206.3208.v409508a_675ff/remoting-3206.3208.v409508a_675ff.jar\" \"/usr/share/jenkins/agent.jar\"\nADD \"https://github.com/jenkinsci/docker-agent/raw/3206.vb_15dcf73f6a_9-12/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\nUSER 10001:0\n", + "image": "jiro-agent-ubuntu-2404", + "registry": "docker.io", + "repository": "eclipsecbi", + "tag": "remoting-3206.3208.v409508a_675ff" + }, + "env": { + "JAVA_TOOL_OPTIONS": [ ], + "JENKINS_REMOTING_JAVA_OPTS": [ + "-showversion", + "-XshowSettings:vm", + "-Xmx256m", + "-Dorg.jenkinsci.remoting.engine.JnlpProtocol3.disabled=true", + "-Dorg.jenkinsci.plugins.gitclient.CliGitAPIImpl.useSETSID=true" + ], + "OPENJ9_JAVA_OPTIONS": [ + "-XX:+IgnoreUnrecognizedVMOptions", + "-XX:+IdleTuningCompactOnIdle", + "-XX:+IdleTuningGcOnIdle" + ], + "_JAVA_OPTIONS": [ ] + }, + "home": "/home/jenkins", + "kubernetes": { + "inheritYamlMergeStrategy": true, + "resources": { + "cpu": { + "limit": "2000m", + "request": "1000m" + }, + "memory": { + "limit": "4096Mi", + "request": "4096Mi" + } + }, + "volumes": [ + { + "mounts": [ + { + "mountPath": "/home/jenkins/.m2/settings-security.xml", + "subPath": "settings-security.xml" + }, + { + "mountPath": "/home/jenkins/.m2/settings.xml", + "subPath": "settings.xml" + } + ], + "name": "m2-secret-dir", + "secret": { + "name": "m2-secret-dir" + } + }, + { + "configMap": { + "name": "m2-dir" + }, + "mounts": [ + { + "mountPath": "/home/jenkins/.m2/toolchains.xml", + "subPath": "toolchains.xml" + }, + { + "mountPath": "/home/jenkins/.mavenrc", + "subPath": ".mavenrc" + } + ], + "name": "m2-dir" + } + ], + "yamlMergeStrategy": "merge" + }, + "labels": [ + "ubuntu-latest", + "ubuntu-2404" + ], + "maxHeap": "256m", + "mode": "EXCLUSIVE", + "name": "ubuntu-2404", + "remoting": { + "jar": "/usr/share/jenkins/agent.jar", + "startupScript": { + "name": "jenkins-agent", + "url": "https://github.com/jenkinsci/docker-agent/raw/3206.vb_15dcf73f6a_9-12/jenkins-agent", + "version": "3206.vb_15dcf73f6a_9-12" + }, + "url": "https://repo.jenkins-ci.org/public/org/jenkins-ci/main/remoting/3206.3208.v409508a_675ff/remoting-3206.3208.v409508a_675ff.jar", + "version": "3206.3208.v409508a_675ff" + }, + "startupScript": "/usr/local/bin/jenkins-agent", + "username": "jenkins" } } } @@ -753,6 +950,7 @@ }, "generate": false }, + "seLinuxLevel": "s0:c48,c42", "secrets": { "dockerconfigjson": { "dockerconfigjson-for-pull-as-default": { diff --git a/instances/ee4j.mvc/target/jenkins/configuration.yml b/instances/ee4j.mvc/target/jenkins/configuration.yml index 6ec4dbc48..d3f304e85 100644 --- a/instances/ee4j.mvc/target/jenkins/configuration.yml +++ b/instances/ee4j.mvc/target/jenkins/configuration.yml @@ -485,6 +485,188 @@ jenkins: name: m2-dir inheritYamlMergeStrategy: "true" yamlMergeStrategy: "merge" + - name: "ubuntu-2204" + namespace: "mvc" + label: "ubuntu-2204" + containers: + - name: "jnlp" + image: docker.io/eclipsecbi/jiro-agent-ubuntu-2204:remoting-3206.3208.v409508a_675ff + alwaysPullImage: true + livenessProbe: + failureThreshold: 0 + initialDelaySeconds: 0 + periodSeconds: 0 + successThreshold: 0 + timeoutSeconds: 0 + ttyEnabled: true + command: "" + args: "" + instanceCap: -1 + nodeUsageMode: EXCLUSIVE + envVars: + - envVar: + key: "JAVA_TOOL_OPTIONS" + 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" + - envVar: + key: "OPENJ9_JAVA_OPTIONS" + value: "-XX:+IgnoreUnrecognizedVMOptions -XX:+IdleTuningCompactOnIdle -XX:+IdleTuningGcOnIdle" + - envVar: + key: "_JAVA_OPTIONS" + value: "" + volumes: + - persistentVolumeClaim: + claimName: "tools-claim-jiro-mvc" + mountPath: "/opt/tools" + readOnly: true + - configMapVolume: + configMapName: "known-hosts" + mountPath: "/home/jenkins/.ssh/" + subPath: "." + - emptyDirVolume: + memory: false + mountPath: "/home/jenkins/" + - emptyDirVolume: + memory: false + mountPath: "/home/jenkins/.m2/repository" + - emptyDirVolume: + memory: false + mountPath: "/home/jenkins/.m2/wrapper" + workspaceVolume: + emptyDirWorkspaceVolume: + memory: false + yaml: | + apiVersion: v1 + kind: Pod + spec: + containers: + - name: jnlp + resources: + limits: + cpu: "2000m" + memory: "4096Mi" + requests: + cpu: "1000m" + memory: "4096Mi" + volumeMounts: + - name: m2-secret-dir + mountPath: /home/jenkins/.m2/settings-security.xml + subPath: settings-security.xml + readOnly: true + - name: m2-secret-dir + mountPath: /home/jenkins/.m2/settings.xml + subPath: settings.xml + readOnly: true + - name: m2-dir + mountPath: /home/jenkins/.m2/toolchains.xml + subPath: toolchains.xml + readOnly: true + - name: m2-dir + mountPath: /home/jenkins/.mavenrc + subPath: .mavenrc + readOnly: true + volumes: + - name: m2-secret-dir + secret: + secretName: m2-secret-dir + - name: m2-dir + configMap: + name: m2-dir + inheritYamlMergeStrategy: "true" + yamlMergeStrategy: "merge" + - name: "ubuntu-2404" + namespace: "mvc" + label: "ubuntu-latest ubuntu-2404" + containers: + - name: "jnlp" + image: docker.io/eclipsecbi/jiro-agent-ubuntu-2404:remoting-3206.3208.v409508a_675ff + alwaysPullImage: true + livenessProbe: + failureThreshold: 0 + initialDelaySeconds: 0 + periodSeconds: 0 + successThreshold: 0 + timeoutSeconds: 0 + ttyEnabled: true + command: "" + args: "" + instanceCap: -1 + nodeUsageMode: EXCLUSIVE + envVars: + - envVar: + key: "JAVA_TOOL_OPTIONS" + 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" + - envVar: + key: "OPENJ9_JAVA_OPTIONS" + value: "-XX:+IgnoreUnrecognizedVMOptions -XX:+IdleTuningCompactOnIdle -XX:+IdleTuningGcOnIdle" + - envVar: + key: "_JAVA_OPTIONS" + value: "" + volumes: + - persistentVolumeClaim: + claimName: "tools-claim-jiro-mvc" + mountPath: "/opt/tools" + readOnly: true + - configMapVolume: + configMapName: "known-hosts" + mountPath: "/home/jenkins/.ssh/" + subPath: "." + - emptyDirVolume: + memory: false + mountPath: "/home/jenkins/" + - emptyDirVolume: + memory: false + mountPath: "/home/jenkins/.m2/repository" + - emptyDirVolume: + memory: false + mountPath: "/home/jenkins/.m2/wrapper" + workspaceVolume: + emptyDirWorkspaceVolume: + memory: false + yaml: | + apiVersion: v1 + kind: Pod + spec: + containers: + - name: jnlp + resources: + limits: + cpu: "2000m" + memory: "4096Mi" + requests: + cpu: "1000m" + memory: "4096Mi" + volumeMounts: + - name: m2-secret-dir + mountPath: /home/jenkins/.m2/settings-security.xml + subPath: settings-security.xml + readOnly: true + - name: m2-secret-dir + mountPath: /home/jenkins/.m2/settings.xml + subPath: settings.xml + readOnly: true + - name: m2-dir + mountPath: /home/jenkins/.m2/toolchains.xml + subPath: toolchains.xml + readOnly: true + - name: m2-dir + mountPath: /home/jenkins/.mavenrc + subPath: .mavenrc + readOnly: true + volumes: + - name: m2-secret-dir + secret: + secretName: m2-secret-dir + - name: m2-dir + configMap: + name: m2-dir + inheritYamlMergeStrategy: "true" + yamlMergeStrategy: "merge" security: apiToken: creationOfLegacyTokenEnabled: false @@ -579,6 +761,8 @@ tool: home: "/opt/tools/java/openjdk/latest" - name: "openjdk-ea-latest" home: "/opt/tools/java/openjdk/ea-latest" + - name: "openjdk-jdk24-latest" + home: "/opt/tools/java/openjdk/jdk-24/latest" - name: "openjdk-jdk23-latest" home: "/opt/tools/java/openjdk/jdk-23/latest" - name: "openjdk-jdk22-latest" @@ -708,6 +892,8 @@ tool: installations: - name: "apache-maven-latest" home: "/opt/tools/apache-maven/latest" + - name: "apache-maven-3.9.9" + home: "/opt/tools/apache-maven/3.9.9" - name: "apache-maven-3.9.6" home: "/opt/tools/apache-maven/3.9.6" - name: "apache-maven-3.9.5" diff --git a/instances/ee4j.mvc/target/k8s/configmap-jenkins-config.yml b/instances/ee4j.mvc/target/k8s/configmap-jenkins-config.yml index 2890b4d10..6ac4f5ccc 100644 --- a/instances/ee4j.mvc/target/k8s/configmap-jenkins-config.yml +++ b/instances/ee4j.mvc/target/k8s/configmap-jenkins-config.yml @@ -508,6 +508,188 @@ data: name: m2-dir inheritYamlMergeStrategy: "true" yamlMergeStrategy: "merge" + - name: "ubuntu-2204" + namespace: "mvc" + label: "ubuntu-2204" + containers: + - name: "jnlp" + image: docker.io/eclipsecbi/jiro-agent-ubuntu-2204:remoting-3206.3208.v409508a_675ff + alwaysPullImage: true + livenessProbe: + failureThreshold: 0 + initialDelaySeconds: 0 + periodSeconds: 0 + successThreshold: 0 + timeoutSeconds: 0 + ttyEnabled: true + command: "" + args: "" + instanceCap: -1 + nodeUsageMode: EXCLUSIVE + envVars: + - envVar: + key: "JAVA_TOOL_OPTIONS" + 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" + - envVar: + key: "OPENJ9_JAVA_OPTIONS" + value: "-XX:+IgnoreUnrecognizedVMOptions -XX:+IdleTuningCompactOnIdle -XX:+IdleTuningGcOnIdle" + - envVar: + key: "_JAVA_OPTIONS" + value: "" + volumes: + - persistentVolumeClaim: + claimName: "tools-claim-jiro-mvc" + mountPath: "/opt/tools" + readOnly: true + - configMapVolume: + configMapName: "known-hosts" + mountPath: "/home/jenkins/.ssh/" + subPath: "." + - emptyDirVolume: + memory: false + mountPath: "/home/jenkins/" + - emptyDirVolume: + memory: false + mountPath: "/home/jenkins/.m2/repository" + - emptyDirVolume: + memory: false + mountPath: "/home/jenkins/.m2/wrapper" + workspaceVolume: + emptyDirWorkspaceVolume: + memory: false + yaml: | + apiVersion: v1 + kind: Pod + spec: + containers: + - name: jnlp + resources: + limits: + cpu: "2000m" + memory: "4096Mi" + requests: + cpu: "1000m" + memory: "4096Mi" + volumeMounts: + - name: m2-secret-dir + mountPath: /home/jenkins/.m2/settings-security.xml + subPath: settings-security.xml + readOnly: true + - name: m2-secret-dir + mountPath: /home/jenkins/.m2/settings.xml + subPath: settings.xml + readOnly: true + - name: m2-dir + mountPath: /home/jenkins/.m2/toolchains.xml + subPath: toolchains.xml + readOnly: true + - name: m2-dir + mountPath: /home/jenkins/.mavenrc + subPath: .mavenrc + readOnly: true + volumes: + - name: m2-secret-dir + secret: + secretName: m2-secret-dir + - name: m2-dir + configMap: + name: m2-dir + inheritYamlMergeStrategy: "true" + yamlMergeStrategy: "merge" + - name: "ubuntu-2404" + namespace: "mvc" + label: "ubuntu-latest ubuntu-2404" + containers: + - name: "jnlp" + image: docker.io/eclipsecbi/jiro-agent-ubuntu-2404:remoting-3206.3208.v409508a_675ff + alwaysPullImage: true + livenessProbe: + failureThreshold: 0 + initialDelaySeconds: 0 + periodSeconds: 0 + successThreshold: 0 + timeoutSeconds: 0 + ttyEnabled: true + command: "" + args: "" + instanceCap: -1 + nodeUsageMode: EXCLUSIVE + envVars: + - envVar: + key: "JAVA_TOOL_OPTIONS" + 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" + - envVar: + key: "OPENJ9_JAVA_OPTIONS" + value: "-XX:+IgnoreUnrecognizedVMOptions -XX:+IdleTuningCompactOnIdle -XX:+IdleTuningGcOnIdle" + - envVar: + key: "_JAVA_OPTIONS" + value: "" + volumes: + - persistentVolumeClaim: + claimName: "tools-claim-jiro-mvc" + mountPath: "/opt/tools" + readOnly: true + - configMapVolume: + configMapName: "known-hosts" + mountPath: "/home/jenkins/.ssh/" + subPath: "." + - emptyDirVolume: + memory: false + mountPath: "/home/jenkins/" + - emptyDirVolume: + memory: false + mountPath: "/home/jenkins/.m2/repository" + - emptyDirVolume: + memory: false + mountPath: "/home/jenkins/.m2/wrapper" + workspaceVolume: + emptyDirWorkspaceVolume: + memory: false + yaml: | + apiVersion: v1 + kind: Pod + spec: + containers: + - name: jnlp + resources: + limits: + cpu: "2000m" + memory: "4096Mi" + requests: + cpu: "1000m" + memory: "4096Mi" + volumeMounts: + - name: m2-secret-dir + mountPath: /home/jenkins/.m2/settings-security.xml + subPath: settings-security.xml + readOnly: true + - name: m2-secret-dir + mountPath: /home/jenkins/.m2/settings.xml + subPath: settings.xml + readOnly: true + - name: m2-dir + mountPath: /home/jenkins/.m2/toolchains.xml + subPath: toolchains.xml + readOnly: true + - name: m2-dir + mountPath: /home/jenkins/.mavenrc + subPath: .mavenrc + readOnly: true + volumes: + - name: m2-secret-dir + secret: + secretName: m2-secret-dir + - name: m2-dir + configMap: + name: m2-dir + inheritYamlMergeStrategy: "true" + yamlMergeStrategy: "merge" security: apiToken: creationOfLegacyTokenEnabled: false @@ -602,6 +784,8 @@ data: home: "/opt/tools/java/openjdk/latest" - name: "openjdk-ea-latest" home: "/opt/tools/java/openjdk/ea-latest" + - name: "openjdk-jdk24-latest" + home: "/opt/tools/java/openjdk/jdk-24/latest" - name: "openjdk-jdk23-latest" home: "/opt/tools/java/openjdk/jdk-23/latest" - name: "openjdk-jdk22-latest" @@ -731,6 +915,8 @@ data: installations: - name: "apache-maven-latest" home: "/opt/tools/apache-maven/latest" + - name: "apache-maven-3.9.9" + home: "/opt/tools/apache-maven/3.9.9" - name: "apache-maven-3.9.6" home: "/opt/tools/apache-maven/3.9.6" - name: "apache-maven-3.9.5" diff --git a/instances/ee4j.mvc/target/k8s/m2-dir.json b/instances/ee4j.mvc/target/k8s/m2-dir.json index 19d498533..5042099b0 100644 --- a/instances/ee4j.mvc/target/k8s/m2-dir.json +++ b/instances/ee4j.mvc/target/k8s/m2-dir.json @@ -2,7 +2,7 @@ "apiVersion": "v1", "data": { ".mavenrc": "set -- -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn --batch-mode \"${@}\"", - "toolchains.xml": "\n\n \n jdk\n \n JavaSE-1.8\n 1.8\n oracle\n \n /opt/tools/java/oracle/jdk-8/latest\n \n \n jdk\n \n JavaSE-9\n 9\n openjdk\n \n /opt/tools/java/openjdk/jdk-9/latest\n \n \n jdk\n \n JavaSE-10\n 10\n openjdk\n \n /opt/tools/java/openjdk/jdk-10/latest\n \n \n jdk\n \n JavaSE-11\n 11\n openjdk\n \n /opt/tools/java/openjdk/jdk-11/latest\n \n \n jdk\n \n JavaSE-12\n 12\n openjdk\n \n /opt/tools/java/openjdk/jdk-12/latest\n \n \n jdk\n \n JavaSE-13\n 13\n openjdk\n \n /opt/tools/java/openjdk/jdk-13/latest\n \n \n jdk\n \n JavaSE-14\n 14\n openjdk\n \n /opt/tools/java/openjdk/jdk-14/latest\n \n \n jdk\n \n JavaSE-15\n 15\n openjdk\n \n /opt/tools/java/openjdk/jdk-15/latest\n \n \n jdk\n \n JavaSE-16\n 16\n openjdk\n \n /opt/tools/java/openjdk/jdk-16/latest\n \n \n jdk\n \n JavaSE-17\n 17\n openjdk\n \n /opt/tools/java/openjdk/jdk-17/latest\n \n \n jdk\n \n JavaSE-18\n 18\n openjdk\n \n /opt/tools/java/openjdk/jdk-18/latest\n \n \n jdk\n \n JavaSE-19\n 19\n openjdk\n \n /opt/tools/java/openjdk/jdk-19/latest\n \n \n jdk\n \n JavaSE-20\n 20\n openjdk\n \n /opt/tools/java/openjdk/jdk-20/latest\n \n \n jdk\n \n JavaSE-21\n 21\n openjdk\n \n /opt/tools/java/openjdk/jdk-21/latest\n \n \n jdk\n \n JavaSE-22\n 22\n openjdk\n \n /opt/tools/java/openjdk/jdk-22/latest\n \n \n jdk\n \n JavaSE-23\n 23\n openjdk\n \n /opt/tools/java/openjdk/jdk-23/latest\n \n\n" + "toolchains.xml": "\n\n \n jdk\n \n JavaSE-1.8\n 1.8\n oracle\n \n /opt/tools/java/oracle/jdk-8/latest\n \n \n jdk\n \n JavaSE-9\n 9\n openjdk\n \n /opt/tools/java/openjdk/jdk-9/latest\n \n \n jdk\n \n JavaSE-10\n 10\n openjdk\n \n /opt/tools/java/openjdk/jdk-10/latest\n \n \n jdk\n \n JavaSE-11\n 11\n openjdk\n \n /opt/tools/java/openjdk/jdk-11/latest\n \n \n jdk\n \n JavaSE-12\n 12\n openjdk\n \n /opt/tools/java/openjdk/jdk-12/latest\n \n \n jdk\n \n JavaSE-13\n 13\n openjdk\n \n /opt/tools/java/openjdk/jdk-13/latest\n \n \n jdk\n \n JavaSE-14\n 14\n openjdk\n \n /opt/tools/java/openjdk/jdk-14/latest\n \n \n jdk\n \n JavaSE-15\n 15\n openjdk\n \n /opt/tools/java/openjdk/jdk-15/latest\n \n \n jdk\n \n JavaSE-16\n 16\n openjdk\n \n /opt/tools/java/openjdk/jdk-16/latest\n \n \n jdk\n \n JavaSE-17\n 17\n openjdk\n \n /opt/tools/java/openjdk/jdk-17/latest\n \n \n jdk\n \n JavaSE-18\n 18\n openjdk\n \n /opt/tools/java/openjdk/jdk-18/latest\n \n \n jdk\n \n JavaSE-19\n 19\n openjdk\n \n /opt/tools/java/openjdk/jdk-19/latest\n \n \n jdk\n \n JavaSE-20\n 20\n openjdk\n \n /opt/tools/java/openjdk/jdk-20/latest\n \n \n jdk\n \n JavaSE-21\n 21\n openjdk\n \n /opt/tools/java/openjdk/jdk-21/latest\n \n \n jdk\n \n JavaSE-22\n 22\n openjdk\n \n /opt/tools/java/openjdk/jdk-22/latest\n \n \n jdk\n \n JavaSE-23\n 23\n openjdk\n \n /opt/tools/java/openjdk/jdk-23/latest\n \n \n jdk\n \n JavaSE-24\n 24\n openjdk\n \n /opt/tools/java/openjdk/jdk-24/latest\n \n\n" }, "kind": "ConfigMap", "metadata": { diff --git a/instances/ee4j.mvc/target/k8s/statefulset.json b/instances/ee4j.mvc/target/k8s/statefulset.json index b70ee16ae..a83e4e422 100644 --- a/instances/ee4j.mvc/target/k8s/statefulset.json +++ b/instances/ee4j.mvc/target/k8s/statefulset.json @@ -119,6 +119,12 @@ "cpu": "250m" } }, + "securityContext": { + "seLinuxOptions": { + "level": "s0:c48,c42", + "type": "spc_t" + } + }, "volumeMounts": [ { "mountPath": "/var/jenkins", diff --git a/instances/ee4j.parsson/config.jsonnet b/instances/ee4j.parsson/config.jsonnet index 51db83901..1638fd3f9 100644 --- a/instances/ee4j.parsson/config.jsonnet +++ b/instances/ee4j.parsson/config.jsonnet @@ -8,4 +8,5 @@ "copyartifact", ], }, + seLinuxLevel: "s0:c51,c15", } diff --git a/instances/ee4j.parsson/target/config.json b/instances/ee4j.parsson/target/config.json index ae9f21f49..f7cc3c07b 100644 --- a/instances/ee4j.parsson/target/config.json +++ b/instances/ee4j.parsson/target/config.json @@ -217,7 +217,7 @@ "docker.io/eclipsecbi/jiro-agent-centos-7:latest" ], "context": "centos-7", - "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-centos-7: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 [ \"uid_entrypoint\", \"/usr/local/bin/jenkins-agent\" ]\n\nADD \"https://repo.jenkins-ci.org/public/org/jenkins-ci/main/remoting/3206.3208.v409508a_675ff/remoting-3206.3208.v409508a_675ff.jar\" \"/usr/share/jenkins/agent.jar\" \nADD \"https://github.com/jenkinsci/docker-agent/raw/3206.vb_15dcf73f6a_9-12/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\nUSER 10001:0\n", + "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-centos-7: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/3206.3208.v409508a_675ff/remoting-3206.3208.v409508a_675ff.jar\" \"/usr/share/jenkins/agent.jar\"\nADD \"https://github.com/jenkinsci/docker-agent/raw/3206.vb_15dcf73f6a_9-12/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\nUSER 10001:0\n", "image": "jiro-agent-centos-7", "registry": "docker.io", "repository": "eclipsecbi", @@ -316,7 +316,7 @@ "docker.io/eclipsecbi/jiro-agent-centos-8:latest" ], "context": "centos-8", - "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-centos-8: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 [ \"uid_entrypoint\", \"/usr/local/bin/jenkins-agent\" ]\n\nADD \"https://repo.jenkins-ci.org/public/org/jenkins-ci/main/remoting/3206.3208.v409508a_675ff/remoting-3206.3208.v409508a_675ff.jar\" \"/usr/share/jenkins/agent.jar\" \nADD \"https://github.com/jenkinsci/docker-agent/raw/3206.vb_15dcf73f6a_9-12/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\nUSER 10001:0\n", + "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-centos-8: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/3206.3208.v409508a_675ff/remoting-3206.3208.v409508a_675ff.jar\" \"/usr/share/jenkins/agent.jar\"\nADD \"https://github.com/jenkinsci/docker-agent/raw/3206.vb_15dcf73f6a_9-12/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\nUSER 10001:0\n", "image": "jiro-agent-centos-8", "registry": "docker.io", "repository": "eclipsecbi", @@ -406,6 +406,203 @@ }, "startupScript": "/usr/local/bin/jenkins-agent", "username": "jenkins" + }, + "ubuntu-2204": { + "agentWorkdir": "/home/jenkins/jenkins-agent", + "docker": { + "aliases": [ + "docker.io/eclipsecbi/jiro-agent-ubuntu-2204:latest" + ], + "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-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/3206.3208.v409508a_675ff/remoting-3206.3208.v409508a_675ff.jar\" \"/usr/share/jenkins/agent.jar\"\nADD \"https://github.com/jenkinsci/docker-agent/raw/3206.vb_15dcf73f6a_9-12/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\nUSER 10001:0\n", + "image": "jiro-agent-ubuntu-2204", + "registry": "docker.io", + "repository": "eclipsecbi", + "tag": "remoting-3206.3208.v409508a_675ff" + }, + "env": { + "JAVA_TOOL_OPTIONS": [ ], + "JENKINS_REMOTING_JAVA_OPTS": [ + "-showversion", + "-XshowSettings:vm", + "-Xmx256m", + "-Dorg.jenkinsci.remoting.engine.JnlpProtocol3.disabled=true", + "-Dorg.jenkinsci.plugins.gitclient.CliGitAPIImpl.useSETSID=true" + ], + "OPENJ9_JAVA_OPTIONS": [ + "-XX:+IgnoreUnrecognizedVMOptions", + "-XX:+IdleTuningCompactOnIdle", + "-XX:+IdleTuningGcOnIdle" + ], + "_JAVA_OPTIONS": [ ] + }, + "home": "/home/jenkins", + "kubernetes": { + "inheritYamlMergeStrategy": true, + "resources": { + "cpu": { + "limit": "2000m", + "request": "1000m" + }, + "memory": { + "limit": "4096Mi", + "request": "4096Mi" + } + }, + "volumes": [ + { + "mounts": [ + { + "mountPath": "/home/jenkins/.m2/settings-security.xml", + "subPath": "settings-security.xml" + }, + { + "mountPath": "/home/jenkins/.m2/settings.xml", + "subPath": "settings.xml" + } + ], + "name": "m2-secret-dir", + "secret": { + "name": "m2-secret-dir" + } + }, + { + "configMap": { + "name": "m2-dir" + }, + "mounts": [ + { + "mountPath": "/home/jenkins/.m2/toolchains.xml", + "subPath": "toolchains.xml" + }, + { + "mountPath": "/home/jenkins/.mavenrc", + "subPath": ".mavenrc" + } + ], + "name": "m2-dir" + } + ], + "yamlMergeStrategy": "merge" + }, + "labels": [ + "ubuntu-2204" + ], + "maxHeap": "256m", + "mode": "EXCLUSIVE", + "name": "ubuntu-2204", + "remoting": { + "jar": "/usr/share/jenkins/agent.jar", + "startupScript": { + "name": "jenkins-agent", + "url": "https://github.com/jenkinsci/docker-agent/raw/3206.vb_15dcf73f6a_9-12/jenkins-agent", + "version": "3206.vb_15dcf73f6a_9-12" + }, + "url": "https://repo.jenkins-ci.org/public/org/jenkins-ci/main/remoting/3206.3208.v409508a_675ff/remoting-3206.3208.v409508a_675ff.jar", + "version": "3206.3208.v409508a_675ff" + }, + "startupScript": "/usr/local/bin/jenkins-agent", + "username": "jenkins" + }, + "ubuntu-2404": { + "agentWorkdir": "/home/jenkins/jenkins-agent", + "docker": { + "aliases": [ + "docker.io/eclipsecbi/jiro-agent-ubuntu-2404:latest" + ], + "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-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/3206.3208.v409508a_675ff/remoting-3206.3208.v409508a_675ff.jar\" \"/usr/share/jenkins/agent.jar\"\nADD \"https://github.com/jenkinsci/docker-agent/raw/3206.vb_15dcf73f6a_9-12/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\nUSER 10001:0\n", + "image": "jiro-agent-ubuntu-2404", + "registry": "docker.io", + "repository": "eclipsecbi", + "tag": "remoting-3206.3208.v409508a_675ff" + }, + "env": { + "JAVA_TOOL_OPTIONS": [ ], + "JENKINS_REMOTING_JAVA_OPTS": [ + "-showversion", + "-XshowSettings:vm", + "-Xmx256m", + "-Dorg.jenkinsci.remoting.engine.JnlpProtocol3.disabled=true", + "-Dorg.jenkinsci.plugins.gitclient.CliGitAPIImpl.useSETSID=true" + ], + "OPENJ9_JAVA_OPTIONS": [ + "-XX:+IgnoreUnrecognizedVMOptions", + "-XX:+IdleTuningCompactOnIdle", + "-XX:+IdleTuningGcOnIdle" + ], + "_JAVA_OPTIONS": [ ] + }, + "home": "/home/jenkins", + "kubernetes": { + "inheritYamlMergeStrategy": true, + "resources": { + "cpu": { + "limit": "2000m", + "request": "1000m" + }, + "memory": { + "limit": "4096Mi", + "request": "4096Mi" + } + }, + "volumes": [ + { + "mounts": [ + { + "mountPath": "/home/jenkins/.m2/settings-security.xml", + "subPath": "settings-security.xml" + }, + { + "mountPath": "/home/jenkins/.m2/settings.xml", + "subPath": "settings.xml" + } + ], + "name": "m2-secret-dir", + "secret": { + "name": "m2-secret-dir" + } + }, + { + "configMap": { + "name": "m2-dir" + }, + "mounts": [ + { + "mountPath": "/home/jenkins/.m2/toolchains.xml", + "subPath": "toolchains.xml" + }, + { + "mountPath": "/home/jenkins/.mavenrc", + "subPath": ".mavenrc" + } + ], + "name": "m2-dir" + } + ], + "yamlMergeStrategy": "merge" + }, + "labels": [ + "ubuntu-latest", + "ubuntu-2404" + ], + "maxHeap": "256m", + "mode": "EXCLUSIVE", + "name": "ubuntu-2404", + "remoting": { + "jar": "/usr/share/jenkins/agent.jar", + "startupScript": { + "name": "jenkins-agent", + "url": "https://github.com/jenkinsci/docker-agent/raw/3206.vb_15dcf73f6a_9-12/jenkins-agent", + "version": "3206.vb_15dcf73f6a_9-12" + }, + "url": "https://repo.jenkins-ci.org/public/org/jenkins-ci/main/remoting/3206.3208.v409508a_675ff/remoting-3206.3208.v409508a_675ff.jar", + "version": "3206.3208.v409508a_675ff" + }, + "startupScript": "/usr/local/bin/jenkins-agent", + "username": "jenkins" } } } @@ -702,6 +899,7 @@ }, "generate": false }, + "seLinuxLevel": "s0:c51,c15", "secrets": { "dockerconfigjson": { "dockerconfigjson-for-pull-as-default": { diff --git a/instances/ee4j.parsson/target/jenkins/configuration.yml b/instances/ee4j.parsson/target/jenkins/configuration.yml index a0edc5014..afa5a9e2a 100644 --- a/instances/ee4j.parsson/target/jenkins/configuration.yml +++ b/instances/ee4j.parsson/target/jenkins/configuration.yml @@ -441,6 +441,188 @@ jenkins: name: m2-dir inheritYamlMergeStrategy: "true" yamlMergeStrategy: "merge" + - name: "ubuntu-2204" + namespace: "parsson" + label: "ubuntu-2204" + containers: + - name: "jnlp" + image: docker.io/eclipsecbi/jiro-agent-ubuntu-2204:remoting-3206.3208.v409508a_675ff + alwaysPullImage: true + livenessProbe: + failureThreshold: 0 + initialDelaySeconds: 0 + periodSeconds: 0 + successThreshold: 0 + timeoutSeconds: 0 + ttyEnabled: true + command: "" + args: "" + instanceCap: -1 + nodeUsageMode: EXCLUSIVE + envVars: + - envVar: + key: "JAVA_TOOL_OPTIONS" + 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" + - envVar: + key: "OPENJ9_JAVA_OPTIONS" + value: "-XX:+IgnoreUnrecognizedVMOptions -XX:+IdleTuningCompactOnIdle -XX:+IdleTuningGcOnIdle" + - envVar: + key: "_JAVA_OPTIONS" + value: "" + volumes: + - persistentVolumeClaim: + claimName: "tools-claim-jiro-parsson" + mountPath: "/opt/tools" + readOnly: true + - configMapVolume: + configMapName: "known-hosts" + mountPath: "/home/jenkins/.ssh/" + subPath: "." + - emptyDirVolume: + memory: false + mountPath: "/home/jenkins/" + - emptyDirVolume: + memory: false + mountPath: "/home/jenkins/.m2/repository" + - emptyDirVolume: + memory: false + mountPath: "/home/jenkins/.m2/wrapper" + workspaceVolume: + emptyDirWorkspaceVolume: + memory: false + yaml: | + apiVersion: v1 + kind: Pod + spec: + containers: + - name: jnlp + resources: + limits: + cpu: "2000m" + memory: "4096Mi" + requests: + cpu: "1000m" + memory: "4096Mi" + volumeMounts: + - name: m2-secret-dir + mountPath: /home/jenkins/.m2/settings-security.xml + subPath: settings-security.xml + readOnly: true + - name: m2-secret-dir + mountPath: /home/jenkins/.m2/settings.xml + subPath: settings.xml + readOnly: true + - name: m2-dir + mountPath: /home/jenkins/.m2/toolchains.xml + subPath: toolchains.xml + readOnly: true + - name: m2-dir + mountPath: /home/jenkins/.mavenrc + subPath: .mavenrc + readOnly: true + volumes: + - name: m2-secret-dir + secret: + secretName: m2-secret-dir + - name: m2-dir + configMap: + name: m2-dir + inheritYamlMergeStrategy: "true" + yamlMergeStrategy: "merge" + - name: "ubuntu-2404" + namespace: "parsson" + label: "ubuntu-latest ubuntu-2404" + containers: + - name: "jnlp" + image: docker.io/eclipsecbi/jiro-agent-ubuntu-2404:remoting-3206.3208.v409508a_675ff + alwaysPullImage: true + livenessProbe: + failureThreshold: 0 + initialDelaySeconds: 0 + periodSeconds: 0 + successThreshold: 0 + timeoutSeconds: 0 + ttyEnabled: true + command: "" + args: "" + instanceCap: -1 + nodeUsageMode: EXCLUSIVE + envVars: + - envVar: + key: "JAVA_TOOL_OPTIONS" + 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" + - envVar: + key: "OPENJ9_JAVA_OPTIONS" + value: "-XX:+IgnoreUnrecognizedVMOptions -XX:+IdleTuningCompactOnIdle -XX:+IdleTuningGcOnIdle" + - envVar: + key: "_JAVA_OPTIONS" + value: "" + volumes: + - persistentVolumeClaim: + claimName: "tools-claim-jiro-parsson" + mountPath: "/opt/tools" + readOnly: true + - configMapVolume: + configMapName: "known-hosts" + mountPath: "/home/jenkins/.ssh/" + subPath: "." + - emptyDirVolume: + memory: false + mountPath: "/home/jenkins/" + - emptyDirVolume: + memory: false + mountPath: "/home/jenkins/.m2/repository" + - emptyDirVolume: + memory: false + mountPath: "/home/jenkins/.m2/wrapper" + workspaceVolume: + emptyDirWorkspaceVolume: + memory: false + yaml: | + apiVersion: v1 + kind: Pod + spec: + containers: + - name: jnlp + resources: + limits: + cpu: "2000m" + memory: "4096Mi" + requests: + cpu: "1000m" + memory: "4096Mi" + volumeMounts: + - name: m2-secret-dir + mountPath: /home/jenkins/.m2/settings-security.xml + subPath: settings-security.xml + readOnly: true + - name: m2-secret-dir + mountPath: /home/jenkins/.m2/settings.xml + subPath: settings.xml + readOnly: true + - name: m2-dir + mountPath: /home/jenkins/.m2/toolchains.xml + subPath: toolchains.xml + readOnly: true + - name: m2-dir + mountPath: /home/jenkins/.mavenrc + subPath: .mavenrc + readOnly: true + volumes: + - name: m2-secret-dir + secret: + secretName: m2-secret-dir + - name: m2-dir + configMap: + name: m2-dir + inheritYamlMergeStrategy: "true" + yamlMergeStrategy: "merge" security: apiToken: creationOfLegacyTokenEnabled: false @@ -535,6 +717,8 @@ tool: home: "/opt/tools/java/openjdk/latest" - name: "openjdk-ea-latest" home: "/opt/tools/java/openjdk/ea-latest" + - name: "openjdk-jdk24-latest" + home: "/opt/tools/java/openjdk/jdk-24/latest" - name: "openjdk-jdk23-latest" home: "/opt/tools/java/openjdk/jdk-23/latest" - name: "openjdk-jdk22-latest" @@ -664,6 +848,8 @@ tool: installations: - name: "apache-maven-latest" home: "/opt/tools/apache-maven/latest" + - name: "apache-maven-3.9.9" + home: "/opt/tools/apache-maven/3.9.9" - name: "apache-maven-3.9.6" home: "/opt/tools/apache-maven/3.9.6" - name: "apache-maven-3.9.5" diff --git a/instances/ee4j.parsson/target/k8s/configmap-jenkins-config.yml b/instances/ee4j.parsson/target/k8s/configmap-jenkins-config.yml index 897a070f2..b1009098d 100644 --- a/instances/ee4j.parsson/target/k8s/configmap-jenkins-config.yml +++ b/instances/ee4j.parsson/target/k8s/configmap-jenkins-config.yml @@ -464,6 +464,188 @@ data: name: m2-dir inheritYamlMergeStrategy: "true" yamlMergeStrategy: "merge" + - name: "ubuntu-2204" + namespace: "parsson" + label: "ubuntu-2204" + containers: + - name: "jnlp" + image: docker.io/eclipsecbi/jiro-agent-ubuntu-2204:remoting-3206.3208.v409508a_675ff + alwaysPullImage: true + livenessProbe: + failureThreshold: 0 + initialDelaySeconds: 0 + periodSeconds: 0 + successThreshold: 0 + timeoutSeconds: 0 + ttyEnabled: true + command: "" + args: "" + instanceCap: -1 + nodeUsageMode: EXCLUSIVE + envVars: + - envVar: + key: "JAVA_TOOL_OPTIONS" + 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" + - envVar: + key: "OPENJ9_JAVA_OPTIONS" + value: "-XX:+IgnoreUnrecognizedVMOptions -XX:+IdleTuningCompactOnIdle -XX:+IdleTuningGcOnIdle" + - envVar: + key: "_JAVA_OPTIONS" + value: "" + volumes: + - persistentVolumeClaim: + claimName: "tools-claim-jiro-parsson" + mountPath: "/opt/tools" + readOnly: true + - configMapVolume: + configMapName: "known-hosts" + mountPath: "/home/jenkins/.ssh/" + subPath: "." + - emptyDirVolume: + memory: false + mountPath: "/home/jenkins/" + - emptyDirVolume: + memory: false + mountPath: "/home/jenkins/.m2/repository" + - emptyDirVolume: + memory: false + mountPath: "/home/jenkins/.m2/wrapper" + workspaceVolume: + emptyDirWorkspaceVolume: + memory: false + yaml: | + apiVersion: v1 + kind: Pod + spec: + containers: + - name: jnlp + resources: + limits: + cpu: "2000m" + memory: "4096Mi" + requests: + cpu: "1000m" + memory: "4096Mi" + volumeMounts: + - name: m2-secret-dir + mountPath: /home/jenkins/.m2/settings-security.xml + subPath: settings-security.xml + readOnly: true + - name: m2-secret-dir + mountPath: /home/jenkins/.m2/settings.xml + subPath: settings.xml + readOnly: true + - name: m2-dir + mountPath: /home/jenkins/.m2/toolchains.xml + subPath: toolchains.xml + readOnly: true + - name: m2-dir + mountPath: /home/jenkins/.mavenrc + subPath: .mavenrc + readOnly: true + volumes: + - name: m2-secret-dir + secret: + secretName: m2-secret-dir + - name: m2-dir + configMap: + name: m2-dir + inheritYamlMergeStrategy: "true" + yamlMergeStrategy: "merge" + - name: "ubuntu-2404" + namespace: "parsson" + label: "ubuntu-latest ubuntu-2404" + containers: + - name: "jnlp" + image: docker.io/eclipsecbi/jiro-agent-ubuntu-2404:remoting-3206.3208.v409508a_675ff + alwaysPullImage: true + livenessProbe: + failureThreshold: 0 + initialDelaySeconds: 0 + periodSeconds: 0 + successThreshold: 0 + timeoutSeconds: 0 + ttyEnabled: true + command: "" + args: "" + instanceCap: -1 + nodeUsageMode: EXCLUSIVE + envVars: + - envVar: + key: "JAVA_TOOL_OPTIONS" + 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" + - envVar: + key: "OPENJ9_JAVA_OPTIONS" + value: "-XX:+IgnoreUnrecognizedVMOptions -XX:+IdleTuningCompactOnIdle -XX:+IdleTuningGcOnIdle" + - envVar: + key: "_JAVA_OPTIONS" + value: "" + volumes: + - persistentVolumeClaim: + claimName: "tools-claim-jiro-parsson" + mountPath: "/opt/tools" + readOnly: true + - configMapVolume: + configMapName: "known-hosts" + mountPath: "/home/jenkins/.ssh/" + subPath: "." + - emptyDirVolume: + memory: false + mountPath: "/home/jenkins/" + - emptyDirVolume: + memory: false + mountPath: "/home/jenkins/.m2/repository" + - emptyDirVolume: + memory: false + mountPath: "/home/jenkins/.m2/wrapper" + workspaceVolume: + emptyDirWorkspaceVolume: + memory: false + yaml: | + apiVersion: v1 + kind: Pod + spec: + containers: + - name: jnlp + resources: + limits: + cpu: "2000m" + memory: "4096Mi" + requests: + cpu: "1000m" + memory: "4096Mi" + volumeMounts: + - name: m2-secret-dir + mountPath: /home/jenkins/.m2/settings-security.xml + subPath: settings-security.xml + readOnly: true + - name: m2-secret-dir + mountPath: /home/jenkins/.m2/settings.xml + subPath: settings.xml + readOnly: true + - name: m2-dir + mountPath: /home/jenkins/.m2/toolchains.xml + subPath: toolchains.xml + readOnly: true + - name: m2-dir + mountPath: /home/jenkins/.mavenrc + subPath: .mavenrc + readOnly: true + volumes: + - name: m2-secret-dir + secret: + secretName: m2-secret-dir + - name: m2-dir + configMap: + name: m2-dir + inheritYamlMergeStrategy: "true" + yamlMergeStrategy: "merge" security: apiToken: creationOfLegacyTokenEnabled: false @@ -558,6 +740,8 @@ data: home: "/opt/tools/java/openjdk/latest" - name: "openjdk-ea-latest" home: "/opt/tools/java/openjdk/ea-latest" + - name: "openjdk-jdk24-latest" + home: "/opt/tools/java/openjdk/jdk-24/latest" - name: "openjdk-jdk23-latest" home: "/opt/tools/java/openjdk/jdk-23/latest" - name: "openjdk-jdk22-latest" @@ -687,6 +871,8 @@ data: installations: - name: "apache-maven-latest" home: "/opt/tools/apache-maven/latest" + - name: "apache-maven-3.9.9" + home: "/opt/tools/apache-maven/3.9.9" - name: "apache-maven-3.9.6" home: "/opt/tools/apache-maven/3.9.6" - name: "apache-maven-3.9.5" diff --git a/instances/ee4j.parsson/target/k8s/m2-dir.json b/instances/ee4j.parsson/target/k8s/m2-dir.json index ab583aef4..d8d179e84 100644 --- a/instances/ee4j.parsson/target/k8s/m2-dir.json +++ b/instances/ee4j.parsson/target/k8s/m2-dir.json @@ -2,7 +2,7 @@ "apiVersion": "v1", "data": { ".mavenrc": "set -- -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn --batch-mode \"${@}\"", - "toolchains.xml": "\n\n \n jdk\n \n JavaSE-1.8\n 1.8\n oracle\n \n /opt/tools/java/oracle/jdk-8/latest\n \n \n jdk\n \n JavaSE-9\n 9\n openjdk\n \n /opt/tools/java/openjdk/jdk-9/latest\n \n \n jdk\n \n JavaSE-10\n 10\n openjdk\n \n /opt/tools/java/openjdk/jdk-10/latest\n \n \n jdk\n \n JavaSE-11\n 11\n openjdk\n \n /opt/tools/java/openjdk/jdk-11/latest\n \n \n jdk\n \n JavaSE-12\n 12\n openjdk\n \n /opt/tools/java/openjdk/jdk-12/latest\n \n \n jdk\n \n JavaSE-13\n 13\n openjdk\n \n /opt/tools/java/openjdk/jdk-13/latest\n \n \n jdk\n \n JavaSE-14\n 14\n openjdk\n \n /opt/tools/java/openjdk/jdk-14/latest\n \n \n jdk\n \n JavaSE-15\n 15\n openjdk\n \n /opt/tools/java/openjdk/jdk-15/latest\n \n \n jdk\n \n JavaSE-16\n 16\n openjdk\n \n /opt/tools/java/openjdk/jdk-16/latest\n \n \n jdk\n \n JavaSE-17\n 17\n openjdk\n \n /opt/tools/java/openjdk/jdk-17/latest\n \n \n jdk\n \n JavaSE-18\n 18\n openjdk\n \n /opt/tools/java/openjdk/jdk-18/latest\n \n \n jdk\n \n JavaSE-19\n 19\n openjdk\n \n /opt/tools/java/openjdk/jdk-19/latest\n \n \n jdk\n \n JavaSE-20\n 20\n openjdk\n \n /opt/tools/java/openjdk/jdk-20/latest\n \n \n jdk\n \n JavaSE-21\n 21\n openjdk\n \n /opt/tools/java/openjdk/jdk-21/latest\n \n \n jdk\n \n JavaSE-22\n 22\n openjdk\n \n /opt/tools/java/openjdk/jdk-22/latest\n \n \n jdk\n \n JavaSE-23\n 23\n openjdk\n \n /opt/tools/java/openjdk/jdk-23/latest\n \n\n" + "toolchains.xml": "\n\n \n jdk\n \n JavaSE-1.8\n 1.8\n oracle\n \n /opt/tools/java/oracle/jdk-8/latest\n \n \n jdk\n \n JavaSE-9\n 9\n openjdk\n \n /opt/tools/java/openjdk/jdk-9/latest\n \n \n jdk\n \n JavaSE-10\n 10\n openjdk\n \n /opt/tools/java/openjdk/jdk-10/latest\n \n \n jdk\n \n JavaSE-11\n 11\n openjdk\n \n /opt/tools/java/openjdk/jdk-11/latest\n \n \n jdk\n \n JavaSE-12\n 12\n openjdk\n \n /opt/tools/java/openjdk/jdk-12/latest\n \n \n jdk\n \n JavaSE-13\n 13\n openjdk\n \n /opt/tools/java/openjdk/jdk-13/latest\n \n \n jdk\n \n JavaSE-14\n 14\n openjdk\n \n /opt/tools/java/openjdk/jdk-14/latest\n \n \n jdk\n \n JavaSE-15\n 15\n openjdk\n \n /opt/tools/java/openjdk/jdk-15/latest\n \n \n jdk\n \n JavaSE-16\n 16\n openjdk\n \n /opt/tools/java/openjdk/jdk-16/latest\n \n \n jdk\n \n JavaSE-17\n 17\n openjdk\n \n /opt/tools/java/openjdk/jdk-17/latest\n \n \n jdk\n \n JavaSE-18\n 18\n openjdk\n \n /opt/tools/java/openjdk/jdk-18/latest\n \n \n jdk\n \n JavaSE-19\n 19\n openjdk\n \n /opt/tools/java/openjdk/jdk-19/latest\n \n \n jdk\n \n JavaSE-20\n 20\n openjdk\n \n /opt/tools/java/openjdk/jdk-20/latest\n \n \n jdk\n \n JavaSE-21\n 21\n openjdk\n \n /opt/tools/java/openjdk/jdk-21/latest\n \n \n jdk\n \n JavaSE-22\n 22\n openjdk\n \n /opt/tools/java/openjdk/jdk-22/latest\n \n \n jdk\n \n JavaSE-23\n 23\n openjdk\n \n /opt/tools/java/openjdk/jdk-23/latest\n \n \n jdk\n \n JavaSE-24\n 24\n openjdk\n \n /opt/tools/java/openjdk/jdk-24/latest\n \n\n" }, "kind": "ConfigMap", "metadata": { diff --git a/instances/ee4j.parsson/target/k8s/statefulset.json b/instances/ee4j.parsson/target/k8s/statefulset.json index e5b0cf8b2..953ecd4c9 100644 --- a/instances/ee4j.parsson/target/k8s/statefulset.json +++ b/instances/ee4j.parsson/target/k8s/statefulset.json @@ -119,6 +119,12 @@ "cpu": "250m" } }, + "securityContext": { + "seLinuxOptions": { + "level": "s0:c51,c15", + "type": "spc_t" + } + }, "volumeMounts": [ { "mountPath": "/var/jenkins", diff --git a/instances/ee4j.rest/config.jsonnet b/instances/ee4j.rest/config.jsonnet index 085812b2a..bc2b27310 100644 --- a/instances/ee4j.rest/config.jsonnet +++ b/instances/ee4j.rest/config.jsonnet @@ -7,5 +7,6 @@ plugins+: [ "copyartifact", ], - } + }, + seLinuxLevel: "s0:c58,c27", } diff --git a/instances/ee4j.rest/target/config.json b/instances/ee4j.rest/target/config.json index 754c8b843..2486df091 100644 --- a/instances/ee4j.rest/target/config.json +++ b/instances/ee4j.rest/target/config.json @@ -217,7 +217,7 @@ "docker.io/eclipsecbi/jiro-agent-centos-7:latest" ], "context": "centos-7", - "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-centos-7: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 [ \"uid_entrypoint\", \"/usr/local/bin/jenkins-agent\" ]\n\nADD \"https://repo.jenkins-ci.org/public/org/jenkins-ci/main/remoting/3206.3208.v409508a_675ff/remoting-3206.3208.v409508a_675ff.jar\" \"/usr/share/jenkins/agent.jar\" \nADD \"https://github.com/jenkinsci/docker-agent/raw/3206.vb_15dcf73f6a_9-12/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\nUSER 10001:0\n", + "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-centos-7: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/3206.3208.v409508a_675ff/remoting-3206.3208.v409508a_675ff.jar\" \"/usr/share/jenkins/agent.jar\"\nADD \"https://github.com/jenkinsci/docker-agent/raw/3206.vb_15dcf73f6a_9-12/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\nUSER 10001:0\n", "image": "jiro-agent-centos-7", "registry": "docker.io", "repository": "eclipsecbi", @@ -316,7 +316,7 @@ "docker.io/eclipsecbi/jiro-agent-centos-8:latest" ], "context": "centos-8", - "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-centos-8: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 [ \"uid_entrypoint\", \"/usr/local/bin/jenkins-agent\" ]\n\nADD \"https://repo.jenkins-ci.org/public/org/jenkins-ci/main/remoting/3206.3208.v409508a_675ff/remoting-3206.3208.v409508a_675ff.jar\" \"/usr/share/jenkins/agent.jar\" \nADD \"https://github.com/jenkinsci/docker-agent/raw/3206.vb_15dcf73f6a_9-12/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\nUSER 10001:0\n", + "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-centos-8: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/3206.3208.v409508a_675ff/remoting-3206.3208.v409508a_675ff.jar\" \"/usr/share/jenkins/agent.jar\"\nADD \"https://github.com/jenkinsci/docker-agent/raw/3206.vb_15dcf73f6a_9-12/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\nUSER 10001:0\n", "image": "jiro-agent-centos-8", "registry": "docker.io", "repository": "eclipsecbi", @@ -406,6 +406,203 @@ }, "startupScript": "/usr/local/bin/jenkins-agent", "username": "jenkins" + }, + "ubuntu-2204": { + "agentWorkdir": "/home/jenkins/jenkins-agent", + "docker": { + "aliases": [ + "docker.io/eclipsecbi/jiro-agent-ubuntu-2204:latest" + ], + "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-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/3206.3208.v409508a_675ff/remoting-3206.3208.v409508a_675ff.jar\" \"/usr/share/jenkins/agent.jar\"\nADD \"https://github.com/jenkinsci/docker-agent/raw/3206.vb_15dcf73f6a_9-12/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\nUSER 10001:0\n", + "image": "jiro-agent-ubuntu-2204", + "registry": "docker.io", + "repository": "eclipsecbi", + "tag": "remoting-3206.3208.v409508a_675ff" + }, + "env": { + "JAVA_TOOL_OPTIONS": [ ], + "JENKINS_REMOTING_JAVA_OPTS": [ + "-showversion", + "-XshowSettings:vm", + "-Xmx256m", + "-Dorg.jenkinsci.remoting.engine.JnlpProtocol3.disabled=true", + "-Dorg.jenkinsci.plugins.gitclient.CliGitAPIImpl.useSETSID=true" + ], + "OPENJ9_JAVA_OPTIONS": [ + "-XX:+IgnoreUnrecognizedVMOptions", + "-XX:+IdleTuningCompactOnIdle", + "-XX:+IdleTuningGcOnIdle" + ], + "_JAVA_OPTIONS": [ ] + }, + "home": "/home/jenkins", + "kubernetes": { + "inheritYamlMergeStrategy": true, + "resources": { + "cpu": { + "limit": "2000m", + "request": "1000m" + }, + "memory": { + "limit": "4096Mi", + "request": "4096Mi" + } + }, + "volumes": [ + { + "mounts": [ + { + "mountPath": "/home/jenkins/.m2/settings-security.xml", + "subPath": "settings-security.xml" + }, + { + "mountPath": "/home/jenkins/.m2/settings.xml", + "subPath": "settings.xml" + } + ], + "name": "m2-secret-dir", + "secret": { + "name": "m2-secret-dir" + } + }, + { + "configMap": { + "name": "m2-dir" + }, + "mounts": [ + { + "mountPath": "/home/jenkins/.m2/toolchains.xml", + "subPath": "toolchains.xml" + }, + { + "mountPath": "/home/jenkins/.mavenrc", + "subPath": ".mavenrc" + } + ], + "name": "m2-dir" + } + ], + "yamlMergeStrategy": "merge" + }, + "labels": [ + "ubuntu-2204" + ], + "maxHeap": "256m", + "mode": "EXCLUSIVE", + "name": "ubuntu-2204", + "remoting": { + "jar": "/usr/share/jenkins/agent.jar", + "startupScript": { + "name": "jenkins-agent", + "url": "https://github.com/jenkinsci/docker-agent/raw/3206.vb_15dcf73f6a_9-12/jenkins-agent", + "version": "3206.vb_15dcf73f6a_9-12" + }, + "url": "https://repo.jenkins-ci.org/public/org/jenkins-ci/main/remoting/3206.3208.v409508a_675ff/remoting-3206.3208.v409508a_675ff.jar", + "version": "3206.3208.v409508a_675ff" + }, + "startupScript": "/usr/local/bin/jenkins-agent", + "username": "jenkins" + }, + "ubuntu-2404": { + "agentWorkdir": "/home/jenkins/jenkins-agent", + "docker": { + "aliases": [ + "docker.io/eclipsecbi/jiro-agent-ubuntu-2404:latest" + ], + "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-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/3206.3208.v409508a_675ff/remoting-3206.3208.v409508a_675ff.jar\" \"/usr/share/jenkins/agent.jar\"\nADD \"https://github.com/jenkinsci/docker-agent/raw/3206.vb_15dcf73f6a_9-12/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\nUSER 10001:0\n", + "image": "jiro-agent-ubuntu-2404", + "registry": "docker.io", + "repository": "eclipsecbi", + "tag": "remoting-3206.3208.v409508a_675ff" + }, + "env": { + "JAVA_TOOL_OPTIONS": [ ], + "JENKINS_REMOTING_JAVA_OPTS": [ + "-showversion", + "-XshowSettings:vm", + "-Xmx256m", + "-Dorg.jenkinsci.remoting.engine.JnlpProtocol3.disabled=true", + "-Dorg.jenkinsci.plugins.gitclient.CliGitAPIImpl.useSETSID=true" + ], + "OPENJ9_JAVA_OPTIONS": [ + "-XX:+IgnoreUnrecognizedVMOptions", + "-XX:+IdleTuningCompactOnIdle", + "-XX:+IdleTuningGcOnIdle" + ], + "_JAVA_OPTIONS": [ ] + }, + "home": "/home/jenkins", + "kubernetes": { + "inheritYamlMergeStrategy": true, + "resources": { + "cpu": { + "limit": "2000m", + "request": "1000m" + }, + "memory": { + "limit": "4096Mi", + "request": "4096Mi" + } + }, + "volumes": [ + { + "mounts": [ + { + "mountPath": "/home/jenkins/.m2/settings-security.xml", + "subPath": "settings-security.xml" + }, + { + "mountPath": "/home/jenkins/.m2/settings.xml", + "subPath": "settings.xml" + } + ], + "name": "m2-secret-dir", + "secret": { + "name": "m2-secret-dir" + } + }, + { + "configMap": { + "name": "m2-dir" + }, + "mounts": [ + { + "mountPath": "/home/jenkins/.m2/toolchains.xml", + "subPath": "toolchains.xml" + }, + { + "mountPath": "/home/jenkins/.mavenrc", + "subPath": ".mavenrc" + } + ], + "name": "m2-dir" + } + ], + "yamlMergeStrategy": "merge" + }, + "labels": [ + "ubuntu-latest", + "ubuntu-2404" + ], + "maxHeap": "256m", + "mode": "EXCLUSIVE", + "name": "ubuntu-2404", + "remoting": { + "jar": "/usr/share/jenkins/agent.jar", + "startupScript": { + "name": "jenkins-agent", + "url": "https://github.com/jenkinsci/docker-agent/raw/3206.vb_15dcf73f6a_9-12/jenkins-agent", + "version": "3206.vb_15dcf73f6a_9-12" + }, + "url": "https://repo.jenkins-ci.org/public/org/jenkins-ci/main/remoting/3206.3208.v409508a_675ff/remoting-3206.3208.v409508a_675ff.jar", + "version": "3206.3208.v409508a_675ff" + }, + "startupScript": "/usr/local/bin/jenkins-agent", + "username": "jenkins" } } } @@ -754,6 +951,7 @@ }, "generate": false }, + "seLinuxLevel": "s0:c58,c27", "secrets": { "dockerconfigjson": { "dockerconfigjson-for-pull-as-default": { diff --git a/instances/ee4j.rest/target/jenkins/configuration.yml b/instances/ee4j.rest/target/jenkins/configuration.yml index 06df2b469..29f094395 100644 --- a/instances/ee4j.rest/target/jenkins/configuration.yml +++ b/instances/ee4j.rest/target/jenkins/configuration.yml @@ -485,6 +485,188 @@ jenkins: name: m2-dir inheritYamlMergeStrategy: "true" yamlMergeStrategy: "merge" + - name: "ubuntu-2204" + namespace: "rest" + label: "ubuntu-2204" + containers: + - name: "jnlp" + image: docker.io/eclipsecbi/jiro-agent-ubuntu-2204:remoting-3206.3208.v409508a_675ff + alwaysPullImage: true + livenessProbe: + failureThreshold: 0 + initialDelaySeconds: 0 + periodSeconds: 0 + successThreshold: 0 + timeoutSeconds: 0 + ttyEnabled: true + command: "" + args: "" + instanceCap: -1 + nodeUsageMode: EXCLUSIVE + envVars: + - envVar: + key: "JAVA_TOOL_OPTIONS" + 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" + - envVar: + key: "OPENJ9_JAVA_OPTIONS" + value: "-XX:+IgnoreUnrecognizedVMOptions -XX:+IdleTuningCompactOnIdle -XX:+IdleTuningGcOnIdle" + - envVar: + key: "_JAVA_OPTIONS" + value: "" + volumes: + - persistentVolumeClaim: + claimName: "tools-claim-jiro-rest" + mountPath: "/opt/tools" + readOnly: true + - configMapVolume: + configMapName: "known-hosts" + mountPath: "/home/jenkins/.ssh/" + subPath: "." + - emptyDirVolume: + memory: false + mountPath: "/home/jenkins/" + - emptyDirVolume: + memory: false + mountPath: "/home/jenkins/.m2/repository" + - emptyDirVolume: + memory: false + mountPath: "/home/jenkins/.m2/wrapper" + workspaceVolume: + emptyDirWorkspaceVolume: + memory: false + yaml: | + apiVersion: v1 + kind: Pod + spec: + containers: + - name: jnlp + resources: + limits: + cpu: "2000m" + memory: "4096Mi" + requests: + cpu: "1000m" + memory: "4096Mi" + volumeMounts: + - name: m2-secret-dir + mountPath: /home/jenkins/.m2/settings-security.xml + subPath: settings-security.xml + readOnly: true + - name: m2-secret-dir + mountPath: /home/jenkins/.m2/settings.xml + subPath: settings.xml + readOnly: true + - name: m2-dir + mountPath: /home/jenkins/.m2/toolchains.xml + subPath: toolchains.xml + readOnly: true + - name: m2-dir + mountPath: /home/jenkins/.mavenrc + subPath: .mavenrc + readOnly: true + volumes: + - name: m2-secret-dir + secret: + secretName: m2-secret-dir + - name: m2-dir + configMap: + name: m2-dir + inheritYamlMergeStrategy: "true" + yamlMergeStrategy: "merge" + - name: "ubuntu-2404" + namespace: "rest" + label: "ubuntu-latest ubuntu-2404" + containers: + - name: "jnlp" + image: docker.io/eclipsecbi/jiro-agent-ubuntu-2404:remoting-3206.3208.v409508a_675ff + alwaysPullImage: true + livenessProbe: + failureThreshold: 0 + initialDelaySeconds: 0 + periodSeconds: 0 + successThreshold: 0 + timeoutSeconds: 0 + ttyEnabled: true + command: "" + args: "" + instanceCap: -1 + nodeUsageMode: EXCLUSIVE + envVars: + - envVar: + key: "JAVA_TOOL_OPTIONS" + 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" + - envVar: + key: "OPENJ9_JAVA_OPTIONS" + value: "-XX:+IgnoreUnrecognizedVMOptions -XX:+IdleTuningCompactOnIdle -XX:+IdleTuningGcOnIdle" + - envVar: + key: "_JAVA_OPTIONS" + value: "" + volumes: + - persistentVolumeClaim: + claimName: "tools-claim-jiro-rest" + mountPath: "/opt/tools" + readOnly: true + - configMapVolume: + configMapName: "known-hosts" + mountPath: "/home/jenkins/.ssh/" + subPath: "." + - emptyDirVolume: + memory: false + mountPath: "/home/jenkins/" + - emptyDirVolume: + memory: false + mountPath: "/home/jenkins/.m2/repository" + - emptyDirVolume: + memory: false + mountPath: "/home/jenkins/.m2/wrapper" + workspaceVolume: + emptyDirWorkspaceVolume: + memory: false + yaml: | + apiVersion: v1 + kind: Pod + spec: + containers: + - name: jnlp + resources: + limits: + cpu: "2000m" + memory: "4096Mi" + requests: + cpu: "1000m" + memory: "4096Mi" + volumeMounts: + - name: m2-secret-dir + mountPath: /home/jenkins/.m2/settings-security.xml + subPath: settings-security.xml + readOnly: true + - name: m2-secret-dir + mountPath: /home/jenkins/.m2/settings.xml + subPath: settings.xml + readOnly: true + - name: m2-dir + mountPath: /home/jenkins/.m2/toolchains.xml + subPath: toolchains.xml + readOnly: true + - name: m2-dir + mountPath: /home/jenkins/.mavenrc + subPath: .mavenrc + readOnly: true + volumes: + - name: m2-secret-dir + secret: + secretName: m2-secret-dir + - name: m2-dir + configMap: + name: m2-dir + inheritYamlMergeStrategy: "true" + yamlMergeStrategy: "merge" security: apiToken: creationOfLegacyTokenEnabled: false @@ -579,6 +761,8 @@ tool: home: "/opt/tools/java/openjdk/latest" - name: "openjdk-ea-latest" home: "/opt/tools/java/openjdk/ea-latest" + - name: "openjdk-jdk24-latest" + home: "/opt/tools/java/openjdk/jdk-24/latest" - name: "openjdk-jdk23-latest" home: "/opt/tools/java/openjdk/jdk-23/latest" - name: "openjdk-jdk22-latest" @@ -708,6 +892,8 @@ tool: installations: - name: "apache-maven-latest" home: "/opt/tools/apache-maven/latest" + - name: "apache-maven-3.9.9" + home: "/opt/tools/apache-maven/3.9.9" - name: "apache-maven-3.9.6" home: "/opt/tools/apache-maven/3.9.6" - name: "apache-maven-3.9.5" diff --git a/instances/ee4j.rest/target/k8s/configmap-jenkins-config.yml b/instances/ee4j.rest/target/k8s/configmap-jenkins-config.yml index a5f6bb040..42243efa4 100644 --- a/instances/ee4j.rest/target/k8s/configmap-jenkins-config.yml +++ b/instances/ee4j.rest/target/k8s/configmap-jenkins-config.yml @@ -508,6 +508,188 @@ data: name: m2-dir inheritYamlMergeStrategy: "true" yamlMergeStrategy: "merge" + - name: "ubuntu-2204" + namespace: "rest" + label: "ubuntu-2204" + containers: + - name: "jnlp" + image: docker.io/eclipsecbi/jiro-agent-ubuntu-2204:remoting-3206.3208.v409508a_675ff + alwaysPullImage: true + livenessProbe: + failureThreshold: 0 + initialDelaySeconds: 0 + periodSeconds: 0 + successThreshold: 0 + timeoutSeconds: 0 + ttyEnabled: true + command: "" + args: "" + instanceCap: -1 + nodeUsageMode: EXCLUSIVE + envVars: + - envVar: + key: "JAVA_TOOL_OPTIONS" + 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" + - envVar: + key: "OPENJ9_JAVA_OPTIONS" + value: "-XX:+IgnoreUnrecognizedVMOptions -XX:+IdleTuningCompactOnIdle -XX:+IdleTuningGcOnIdle" + - envVar: + key: "_JAVA_OPTIONS" + value: "" + volumes: + - persistentVolumeClaim: + claimName: "tools-claim-jiro-rest" + mountPath: "/opt/tools" + readOnly: true + - configMapVolume: + configMapName: "known-hosts" + mountPath: "/home/jenkins/.ssh/" + subPath: "." + - emptyDirVolume: + memory: false + mountPath: "/home/jenkins/" + - emptyDirVolume: + memory: false + mountPath: "/home/jenkins/.m2/repository" + - emptyDirVolume: + memory: false + mountPath: "/home/jenkins/.m2/wrapper" + workspaceVolume: + emptyDirWorkspaceVolume: + memory: false + yaml: | + apiVersion: v1 + kind: Pod + spec: + containers: + - name: jnlp + resources: + limits: + cpu: "2000m" + memory: "4096Mi" + requests: + cpu: "1000m" + memory: "4096Mi" + volumeMounts: + - name: m2-secret-dir + mountPath: /home/jenkins/.m2/settings-security.xml + subPath: settings-security.xml + readOnly: true + - name: m2-secret-dir + mountPath: /home/jenkins/.m2/settings.xml + subPath: settings.xml + readOnly: true + - name: m2-dir + mountPath: /home/jenkins/.m2/toolchains.xml + subPath: toolchains.xml + readOnly: true + - name: m2-dir + mountPath: /home/jenkins/.mavenrc + subPath: .mavenrc + readOnly: true + volumes: + - name: m2-secret-dir + secret: + secretName: m2-secret-dir + - name: m2-dir + configMap: + name: m2-dir + inheritYamlMergeStrategy: "true" + yamlMergeStrategy: "merge" + - name: "ubuntu-2404" + namespace: "rest" + label: "ubuntu-latest ubuntu-2404" + containers: + - name: "jnlp" + image: docker.io/eclipsecbi/jiro-agent-ubuntu-2404:remoting-3206.3208.v409508a_675ff + alwaysPullImage: true + livenessProbe: + failureThreshold: 0 + initialDelaySeconds: 0 + periodSeconds: 0 + successThreshold: 0 + timeoutSeconds: 0 + ttyEnabled: true + command: "" + args: "" + instanceCap: -1 + nodeUsageMode: EXCLUSIVE + envVars: + - envVar: + key: "JAVA_TOOL_OPTIONS" + 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" + - envVar: + key: "OPENJ9_JAVA_OPTIONS" + value: "-XX:+IgnoreUnrecognizedVMOptions -XX:+IdleTuningCompactOnIdle -XX:+IdleTuningGcOnIdle" + - envVar: + key: "_JAVA_OPTIONS" + value: "" + volumes: + - persistentVolumeClaim: + claimName: "tools-claim-jiro-rest" + mountPath: "/opt/tools" + readOnly: true + - configMapVolume: + configMapName: "known-hosts" + mountPath: "/home/jenkins/.ssh/" + subPath: "." + - emptyDirVolume: + memory: false + mountPath: "/home/jenkins/" + - emptyDirVolume: + memory: false + mountPath: "/home/jenkins/.m2/repository" + - emptyDirVolume: + memory: false + mountPath: "/home/jenkins/.m2/wrapper" + workspaceVolume: + emptyDirWorkspaceVolume: + memory: false + yaml: | + apiVersion: v1 + kind: Pod + spec: + containers: + - name: jnlp + resources: + limits: + cpu: "2000m" + memory: "4096Mi" + requests: + cpu: "1000m" + memory: "4096Mi" + volumeMounts: + - name: m2-secret-dir + mountPath: /home/jenkins/.m2/settings-security.xml + subPath: settings-security.xml + readOnly: true + - name: m2-secret-dir + mountPath: /home/jenkins/.m2/settings.xml + subPath: settings.xml + readOnly: true + - name: m2-dir + mountPath: /home/jenkins/.m2/toolchains.xml + subPath: toolchains.xml + readOnly: true + - name: m2-dir + mountPath: /home/jenkins/.mavenrc + subPath: .mavenrc + readOnly: true + volumes: + - name: m2-secret-dir + secret: + secretName: m2-secret-dir + - name: m2-dir + configMap: + name: m2-dir + inheritYamlMergeStrategy: "true" + yamlMergeStrategy: "merge" security: apiToken: creationOfLegacyTokenEnabled: false @@ -602,6 +784,8 @@ data: home: "/opt/tools/java/openjdk/latest" - name: "openjdk-ea-latest" home: "/opt/tools/java/openjdk/ea-latest" + - name: "openjdk-jdk24-latest" + home: "/opt/tools/java/openjdk/jdk-24/latest" - name: "openjdk-jdk23-latest" home: "/opt/tools/java/openjdk/jdk-23/latest" - name: "openjdk-jdk22-latest" @@ -731,6 +915,8 @@ data: installations: - name: "apache-maven-latest" home: "/opt/tools/apache-maven/latest" + - name: "apache-maven-3.9.9" + home: "/opt/tools/apache-maven/3.9.9" - name: "apache-maven-3.9.6" home: "/opt/tools/apache-maven/3.9.6" - name: "apache-maven-3.9.5" diff --git a/instances/ee4j.rest/target/k8s/m2-dir.json b/instances/ee4j.rest/target/k8s/m2-dir.json index 4df8a4816..04ea28ffd 100644 --- a/instances/ee4j.rest/target/k8s/m2-dir.json +++ b/instances/ee4j.rest/target/k8s/m2-dir.json @@ -2,7 +2,7 @@ "apiVersion": "v1", "data": { ".mavenrc": "set -- -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn --batch-mode \"${@}\"", - "toolchains.xml": "\n\n \n jdk\n \n JavaSE-1.8\n 1.8\n oracle\n \n /opt/tools/java/oracle/jdk-8/latest\n \n \n jdk\n \n JavaSE-9\n 9\n openjdk\n \n /opt/tools/java/openjdk/jdk-9/latest\n \n \n jdk\n \n JavaSE-10\n 10\n openjdk\n \n /opt/tools/java/openjdk/jdk-10/latest\n \n \n jdk\n \n JavaSE-11\n 11\n openjdk\n \n /opt/tools/java/openjdk/jdk-11/latest\n \n \n jdk\n \n JavaSE-12\n 12\n openjdk\n \n /opt/tools/java/openjdk/jdk-12/latest\n \n \n jdk\n \n JavaSE-13\n 13\n openjdk\n \n /opt/tools/java/openjdk/jdk-13/latest\n \n \n jdk\n \n JavaSE-14\n 14\n openjdk\n \n /opt/tools/java/openjdk/jdk-14/latest\n \n \n jdk\n \n JavaSE-15\n 15\n openjdk\n \n /opt/tools/java/openjdk/jdk-15/latest\n \n \n jdk\n \n JavaSE-16\n 16\n openjdk\n \n /opt/tools/java/openjdk/jdk-16/latest\n \n \n jdk\n \n JavaSE-17\n 17\n openjdk\n \n /opt/tools/java/openjdk/jdk-17/latest\n \n \n jdk\n \n JavaSE-18\n 18\n openjdk\n \n /opt/tools/java/openjdk/jdk-18/latest\n \n \n jdk\n \n JavaSE-19\n 19\n openjdk\n \n /opt/tools/java/openjdk/jdk-19/latest\n \n \n jdk\n \n JavaSE-20\n 20\n openjdk\n \n /opt/tools/java/openjdk/jdk-20/latest\n \n \n jdk\n \n JavaSE-21\n 21\n openjdk\n \n /opt/tools/java/openjdk/jdk-21/latest\n \n \n jdk\n \n JavaSE-22\n 22\n openjdk\n \n /opt/tools/java/openjdk/jdk-22/latest\n \n \n jdk\n \n JavaSE-23\n 23\n openjdk\n \n /opt/tools/java/openjdk/jdk-23/latest\n \n\n" + "toolchains.xml": "\n\n \n jdk\n \n JavaSE-1.8\n 1.8\n oracle\n \n /opt/tools/java/oracle/jdk-8/latest\n \n \n jdk\n \n JavaSE-9\n 9\n openjdk\n \n /opt/tools/java/openjdk/jdk-9/latest\n \n \n jdk\n \n JavaSE-10\n 10\n openjdk\n \n /opt/tools/java/openjdk/jdk-10/latest\n \n \n jdk\n \n JavaSE-11\n 11\n openjdk\n \n /opt/tools/java/openjdk/jdk-11/latest\n \n \n jdk\n \n JavaSE-12\n 12\n openjdk\n \n /opt/tools/java/openjdk/jdk-12/latest\n \n \n jdk\n \n JavaSE-13\n 13\n openjdk\n \n /opt/tools/java/openjdk/jdk-13/latest\n \n \n jdk\n \n JavaSE-14\n 14\n openjdk\n \n /opt/tools/java/openjdk/jdk-14/latest\n \n \n jdk\n \n JavaSE-15\n 15\n openjdk\n \n /opt/tools/java/openjdk/jdk-15/latest\n \n \n jdk\n \n JavaSE-16\n 16\n openjdk\n \n /opt/tools/java/openjdk/jdk-16/latest\n \n \n jdk\n \n JavaSE-17\n 17\n openjdk\n \n /opt/tools/java/openjdk/jdk-17/latest\n \n \n jdk\n \n JavaSE-18\n 18\n openjdk\n \n /opt/tools/java/openjdk/jdk-18/latest\n \n \n jdk\n \n JavaSE-19\n 19\n openjdk\n \n /opt/tools/java/openjdk/jdk-19/latest\n \n \n jdk\n \n JavaSE-20\n 20\n openjdk\n \n /opt/tools/java/openjdk/jdk-20/latest\n \n \n jdk\n \n JavaSE-21\n 21\n openjdk\n \n /opt/tools/java/openjdk/jdk-21/latest\n \n \n jdk\n \n JavaSE-22\n 22\n openjdk\n \n /opt/tools/java/openjdk/jdk-22/latest\n \n \n jdk\n \n JavaSE-23\n 23\n openjdk\n \n /opt/tools/java/openjdk/jdk-23/latest\n \n \n jdk\n \n JavaSE-24\n 24\n openjdk\n \n /opt/tools/java/openjdk/jdk-24/latest\n \n\n" }, "kind": "ConfigMap", "metadata": { diff --git a/instances/ee4j.rest/target/k8s/statefulset.json b/instances/ee4j.rest/target/k8s/statefulset.json index cb3f6ff55..5c9bf70a4 100644 --- a/instances/ee4j.rest/target/k8s/statefulset.json +++ b/instances/ee4j.rest/target/k8s/statefulset.json @@ -119,6 +119,12 @@ "cpu": "250m" } }, + "securityContext": { + "seLinuxOptions": { + "level": "s0:c58,c27", + "type": "spc_t" + } + }, "volumeMounts": [ { "mountPath": "/var/jenkins", diff --git a/instances/ee4j.soteria/config.jsonnet b/instances/ee4j.soteria/config.jsonnet index e14e53f4b..308452e6f 100644 --- a/instances/ee4j.soteria/config.jsonnet +++ b/instances/ee4j.soteria/config.jsonnet @@ -3,4 +3,5 @@ fullName: "ee4j.soteria", displayName: "Eclipse Soteria", }, + seLinuxLevel: "s0:c53,c52", } diff --git a/instances/ee4j.soteria/target/config.json b/instances/ee4j.soteria/target/config.json index 3114990de..bffb158c3 100644 --- a/instances/ee4j.soteria/target/config.json +++ b/instances/ee4j.soteria/target/config.json @@ -217,7 +217,7 @@ "docker.io/eclipsecbi/jiro-agent-centos-7:latest" ], "context": "centos-7", - "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-centos-7: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 [ \"uid_entrypoint\", \"/usr/local/bin/jenkins-agent\" ]\n\nADD \"https://repo.jenkins-ci.org/public/org/jenkins-ci/main/remoting/3206.3208.v409508a_675ff/remoting-3206.3208.v409508a_675ff.jar\" \"/usr/share/jenkins/agent.jar\" \nADD \"https://github.com/jenkinsci/docker-agent/raw/3206.vb_15dcf73f6a_9-12/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\nUSER 10001:0\n", + "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-centos-7: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/3206.3208.v409508a_675ff/remoting-3206.3208.v409508a_675ff.jar\" \"/usr/share/jenkins/agent.jar\"\nADD \"https://github.com/jenkinsci/docker-agent/raw/3206.vb_15dcf73f6a_9-12/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\nUSER 10001:0\n", "image": "jiro-agent-centos-7", "registry": "docker.io", "repository": "eclipsecbi", @@ -316,7 +316,7 @@ "docker.io/eclipsecbi/jiro-agent-centos-8:latest" ], "context": "centos-8", - "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-centos-8: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 [ \"uid_entrypoint\", \"/usr/local/bin/jenkins-agent\" ]\n\nADD \"https://repo.jenkins-ci.org/public/org/jenkins-ci/main/remoting/3206.3208.v409508a_675ff/remoting-3206.3208.v409508a_675ff.jar\" \"/usr/share/jenkins/agent.jar\" \nADD \"https://github.com/jenkinsci/docker-agent/raw/3206.vb_15dcf73f6a_9-12/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\nUSER 10001:0\n", + "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-centos-8: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/3206.3208.v409508a_675ff/remoting-3206.3208.v409508a_675ff.jar\" \"/usr/share/jenkins/agent.jar\"\nADD \"https://github.com/jenkinsci/docker-agent/raw/3206.vb_15dcf73f6a_9-12/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\nUSER 10001:0\n", "image": "jiro-agent-centos-8", "registry": "docker.io", "repository": "eclipsecbi", @@ -406,6 +406,203 @@ }, "startupScript": "/usr/local/bin/jenkins-agent", "username": "jenkins" + }, + "ubuntu-2204": { + "agentWorkdir": "/home/jenkins/jenkins-agent", + "docker": { + "aliases": [ + "docker.io/eclipsecbi/jiro-agent-ubuntu-2204:latest" + ], + "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-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/3206.3208.v409508a_675ff/remoting-3206.3208.v409508a_675ff.jar\" \"/usr/share/jenkins/agent.jar\"\nADD \"https://github.com/jenkinsci/docker-agent/raw/3206.vb_15dcf73f6a_9-12/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\nUSER 10001:0\n", + "image": "jiro-agent-ubuntu-2204", + "registry": "docker.io", + "repository": "eclipsecbi", + "tag": "remoting-3206.3208.v409508a_675ff" + }, + "env": { + "JAVA_TOOL_OPTIONS": [ ], + "JENKINS_REMOTING_JAVA_OPTS": [ + "-showversion", + "-XshowSettings:vm", + "-Xmx256m", + "-Dorg.jenkinsci.remoting.engine.JnlpProtocol3.disabled=true", + "-Dorg.jenkinsci.plugins.gitclient.CliGitAPIImpl.useSETSID=true" + ], + "OPENJ9_JAVA_OPTIONS": [ + "-XX:+IgnoreUnrecognizedVMOptions", + "-XX:+IdleTuningCompactOnIdle", + "-XX:+IdleTuningGcOnIdle" + ], + "_JAVA_OPTIONS": [ ] + }, + "home": "/home/jenkins", + "kubernetes": { + "inheritYamlMergeStrategy": true, + "resources": { + "cpu": { + "limit": "2000m", + "request": "1000m" + }, + "memory": { + "limit": "4096Mi", + "request": "4096Mi" + } + }, + "volumes": [ + { + "mounts": [ + { + "mountPath": "/home/jenkins/.m2/settings-security.xml", + "subPath": "settings-security.xml" + }, + { + "mountPath": "/home/jenkins/.m2/settings.xml", + "subPath": "settings.xml" + } + ], + "name": "m2-secret-dir", + "secret": { + "name": "m2-secret-dir" + } + }, + { + "configMap": { + "name": "m2-dir" + }, + "mounts": [ + { + "mountPath": "/home/jenkins/.m2/toolchains.xml", + "subPath": "toolchains.xml" + }, + { + "mountPath": "/home/jenkins/.mavenrc", + "subPath": ".mavenrc" + } + ], + "name": "m2-dir" + } + ], + "yamlMergeStrategy": "merge" + }, + "labels": [ + "ubuntu-2204" + ], + "maxHeap": "256m", + "mode": "EXCLUSIVE", + "name": "ubuntu-2204", + "remoting": { + "jar": "/usr/share/jenkins/agent.jar", + "startupScript": { + "name": "jenkins-agent", + "url": "https://github.com/jenkinsci/docker-agent/raw/3206.vb_15dcf73f6a_9-12/jenkins-agent", + "version": "3206.vb_15dcf73f6a_9-12" + }, + "url": "https://repo.jenkins-ci.org/public/org/jenkins-ci/main/remoting/3206.3208.v409508a_675ff/remoting-3206.3208.v409508a_675ff.jar", + "version": "3206.3208.v409508a_675ff" + }, + "startupScript": "/usr/local/bin/jenkins-agent", + "username": "jenkins" + }, + "ubuntu-2404": { + "agentWorkdir": "/home/jenkins/jenkins-agent", + "docker": { + "aliases": [ + "docker.io/eclipsecbi/jiro-agent-ubuntu-2404:latest" + ], + "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-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/3206.3208.v409508a_675ff/remoting-3206.3208.v409508a_675ff.jar\" \"/usr/share/jenkins/agent.jar\"\nADD \"https://github.com/jenkinsci/docker-agent/raw/3206.vb_15dcf73f6a_9-12/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\nUSER 10001:0\n", + "image": "jiro-agent-ubuntu-2404", + "registry": "docker.io", + "repository": "eclipsecbi", + "tag": "remoting-3206.3208.v409508a_675ff" + }, + "env": { + "JAVA_TOOL_OPTIONS": [ ], + "JENKINS_REMOTING_JAVA_OPTS": [ + "-showversion", + "-XshowSettings:vm", + "-Xmx256m", + "-Dorg.jenkinsci.remoting.engine.JnlpProtocol3.disabled=true", + "-Dorg.jenkinsci.plugins.gitclient.CliGitAPIImpl.useSETSID=true" + ], + "OPENJ9_JAVA_OPTIONS": [ + "-XX:+IgnoreUnrecognizedVMOptions", + "-XX:+IdleTuningCompactOnIdle", + "-XX:+IdleTuningGcOnIdle" + ], + "_JAVA_OPTIONS": [ ] + }, + "home": "/home/jenkins", + "kubernetes": { + "inheritYamlMergeStrategy": true, + "resources": { + "cpu": { + "limit": "2000m", + "request": "1000m" + }, + "memory": { + "limit": "4096Mi", + "request": "4096Mi" + } + }, + "volumes": [ + { + "mounts": [ + { + "mountPath": "/home/jenkins/.m2/settings-security.xml", + "subPath": "settings-security.xml" + }, + { + "mountPath": "/home/jenkins/.m2/settings.xml", + "subPath": "settings.xml" + } + ], + "name": "m2-secret-dir", + "secret": { + "name": "m2-secret-dir" + } + }, + { + "configMap": { + "name": "m2-dir" + }, + "mounts": [ + { + "mountPath": "/home/jenkins/.m2/toolchains.xml", + "subPath": "toolchains.xml" + }, + { + "mountPath": "/home/jenkins/.mavenrc", + "subPath": ".mavenrc" + } + ], + "name": "m2-dir" + } + ], + "yamlMergeStrategy": "merge" + }, + "labels": [ + "ubuntu-latest", + "ubuntu-2404" + ], + "maxHeap": "256m", + "mode": "EXCLUSIVE", + "name": "ubuntu-2404", + "remoting": { + "jar": "/usr/share/jenkins/agent.jar", + "startupScript": { + "name": "jenkins-agent", + "url": "https://github.com/jenkinsci/docker-agent/raw/3206.vb_15dcf73f6a_9-12/jenkins-agent", + "version": "3206.vb_15dcf73f6a_9-12" + }, + "url": "https://repo.jenkins-ci.org/public/org/jenkins-ci/main/remoting/3206.3208.v409508a_675ff/remoting-3206.3208.v409508a_675ff.jar", + "version": "3206.3208.v409508a_675ff" + }, + "startupScript": "/usr/local/bin/jenkins-agent", + "username": "jenkins" } } } @@ -701,6 +898,7 @@ }, "generate": false }, + "seLinuxLevel": "s0:c53,c52", "secrets": { "dockerconfigjson": { "dockerconfigjson-for-pull-as-default": { diff --git a/instances/ee4j.soteria/target/jenkins/configuration.yml b/instances/ee4j.soteria/target/jenkins/configuration.yml index bb4c8b3b3..09d871acf 100644 --- a/instances/ee4j.soteria/target/jenkins/configuration.yml +++ b/instances/ee4j.soteria/target/jenkins/configuration.yml @@ -441,6 +441,188 @@ jenkins: name: m2-dir inheritYamlMergeStrategy: "true" yamlMergeStrategy: "merge" + - name: "ubuntu-2204" + namespace: "soteria" + label: "ubuntu-2204" + containers: + - name: "jnlp" + image: docker.io/eclipsecbi/jiro-agent-ubuntu-2204:remoting-3206.3208.v409508a_675ff + alwaysPullImage: true + livenessProbe: + failureThreshold: 0 + initialDelaySeconds: 0 + periodSeconds: 0 + successThreshold: 0 + timeoutSeconds: 0 + ttyEnabled: true + command: "" + args: "" + instanceCap: -1 + nodeUsageMode: EXCLUSIVE + envVars: + - envVar: + key: "JAVA_TOOL_OPTIONS" + 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" + - envVar: + key: "OPENJ9_JAVA_OPTIONS" + value: "-XX:+IgnoreUnrecognizedVMOptions -XX:+IdleTuningCompactOnIdle -XX:+IdleTuningGcOnIdle" + - envVar: + key: "_JAVA_OPTIONS" + value: "" + volumes: + - persistentVolumeClaim: + claimName: "tools-claim-jiro-soteria" + mountPath: "/opt/tools" + readOnly: true + - configMapVolume: + configMapName: "known-hosts" + mountPath: "/home/jenkins/.ssh/" + subPath: "." + - emptyDirVolume: + memory: false + mountPath: "/home/jenkins/" + - emptyDirVolume: + memory: false + mountPath: "/home/jenkins/.m2/repository" + - emptyDirVolume: + memory: false + mountPath: "/home/jenkins/.m2/wrapper" + workspaceVolume: + emptyDirWorkspaceVolume: + memory: false + yaml: | + apiVersion: v1 + kind: Pod + spec: + containers: + - name: jnlp + resources: + limits: + cpu: "2000m" + memory: "4096Mi" + requests: + cpu: "1000m" + memory: "4096Mi" + volumeMounts: + - name: m2-secret-dir + mountPath: /home/jenkins/.m2/settings-security.xml + subPath: settings-security.xml + readOnly: true + - name: m2-secret-dir + mountPath: /home/jenkins/.m2/settings.xml + subPath: settings.xml + readOnly: true + - name: m2-dir + mountPath: /home/jenkins/.m2/toolchains.xml + subPath: toolchains.xml + readOnly: true + - name: m2-dir + mountPath: /home/jenkins/.mavenrc + subPath: .mavenrc + readOnly: true + volumes: + - name: m2-secret-dir + secret: + secretName: m2-secret-dir + - name: m2-dir + configMap: + name: m2-dir + inheritYamlMergeStrategy: "true" + yamlMergeStrategy: "merge" + - name: "ubuntu-2404" + namespace: "soteria" + label: "ubuntu-latest ubuntu-2404" + containers: + - name: "jnlp" + image: docker.io/eclipsecbi/jiro-agent-ubuntu-2404:remoting-3206.3208.v409508a_675ff + alwaysPullImage: true + livenessProbe: + failureThreshold: 0 + initialDelaySeconds: 0 + periodSeconds: 0 + successThreshold: 0 + timeoutSeconds: 0 + ttyEnabled: true + command: "" + args: "" + instanceCap: -1 + nodeUsageMode: EXCLUSIVE + envVars: + - envVar: + key: "JAVA_TOOL_OPTIONS" + 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" + - envVar: + key: "OPENJ9_JAVA_OPTIONS" + value: "-XX:+IgnoreUnrecognizedVMOptions -XX:+IdleTuningCompactOnIdle -XX:+IdleTuningGcOnIdle" + - envVar: + key: "_JAVA_OPTIONS" + value: "" + volumes: + - persistentVolumeClaim: + claimName: "tools-claim-jiro-soteria" + mountPath: "/opt/tools" + readOnly: true + - configMapVolume: + configMapName: "known-hosts" + mountPath: "/home/jenkins/.ssh/" + subPath: "." + - emptyDirVolume: + memory: false + mountPath: "/home/jenkins/" + - emptyDirVolume: + memory: false + mountPath: "/home/jenkins/.m2/repository" + - emptyDirVolume: + memory: false + mountPath: "/home/jenkins/.m2/wrapper" + workspaceVolume: + emptyDirWorkspaceVolume: + memory: false + yaml: | + apiVersion: v1 + kind: Pod + spec: + containers: + - name: jnlp + resources: + limits: + cpu: "2000m" + memory: "4096Mi" + requests: + cpu: "1000m" + memory: "4096Mi" + volumeMounts: + - name: m2-secret-dir + mountPath: /home/jenkins/.m2/settings-security.xml + subPath: settings-security.xml + readOnly: true + - name: m2-secret-dir + mountPath: /home/jenkins/.m2/settings.xml + subPath: settings.xml + readOnly: true + - name: m2-dir + mountPath: /home/jenkins/.m2/toolchains.xml + subPath: toolchains.xml + readOnly: true + - name: m2-dir + mountPath: /home/jenkins/.mavenrc + subPath: .mavenrc + readOnly: true + volumes: + - name: m2-secret-dir + secret: + secretName: m2-secret-dir + - name: m2-dir + configMap: + name: m2-dir + inheritYamlMergeStrategy: "true" + yamlMergeStrategy: "merge" security: apiToken: creationOfLegacyTokenEnabled: false @@ -535,6 +717,8 @@ tool: home: "/opt/tools/java/openjdk/latest" - name: "openjdk-ea-latest" home: "/opt/tools/java/openjdk/ea-latest" + - name: "openjdk-jdk24-latest" + home: "/opt/tools/java/openjdk/jdk-24/latest" - name: "openjdk-jdk23-latest" home: "/opt/tools/java/openjdk/jdk-23/latest" - name: "openjdk-jdk22-latest" @@ -664,6 +848,8 @@ tool: installations: - name: "apache-maven-latest" home: "/opt/tools/apache-maven/latest" + - name: "apache-maven-3.9.9" + home: "/opt/tools/apache-maven/3.9.9" - name: "apache-maven-3.9.6" home: "/opt/tools/apache-maven/3.9.6" - name: "apache-maven-3.9.5" diff --git a/instances/ee4j.soteria/target/k8s/configmap-jenkins-config.yml b/instances/ee4j.soteria/target/k8s/configmap-jenkins-config.yml index a2d5e6db8..0c74e4fa9 100644 --- a/instances/ee4j.soteria/target/k8s/configmap-jenkins-config.yml +++ b/instances/ee4j.soteria/target/k8s/configmap-jenkins-config.yml @@ -464,6 +464,188 @@ data: name: m2-dir inheritYamlMergeStrategy: "true" yamlMergeStrategy: "merge" + - name: "ubuntu-2204" + namespace: "soteria" + label: "ubuntu-2204" + containers: + - name: "jnlp" + image: docker.io/eclipsecbi/jiro-agent-ubuntu-2204:remoting-3206.3208.v409508a_675ff + alwaysPullImage: true + livenessProbe: + failureThreshold: 0 + initialDelaySeconds: 0 + periodSeconds: 0 + successThreshold: 0 + timeoutSeconds: 0 + ttyEnabled: true + command: "" + args: "" + instanceCap: -1 + nodeUsageMode: EXCLUSIVE + envVars: + - envVar: + key: "JAVA_TOOL_OPTIONS" + 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" + - envVar: + key: "OPENJ9_JAVA_OPTIONS" + value: "-XX:+IgnoreUnrecognizedVMOptions -XX:+IdleTuningCompactOnIdle -XX:+IdleTuningGcOnIdle" + - envVar: + key: "_JAVA_OPTIONS" + value: "" + volumes: + - persistentVolumeClaim: + claimName: "tools-claim-jiro-soteria" + mountPath: "/opt/tools" + readOnly: true + - configMapVolume: + configMapName: "known-hosts" + mountPath: "/home/jenkins/.ssh/" + subPath: "." + - emptyDirVolume: + memory: false + mountPath: "/home/jenkins/" + - emptyDirVolume: + memory: false + mountPath: "/home/jenkins/.m2/repository" + - emptyDirVolume: + memory: false + mountPath: "/home/jenkins/.m2/wrapper" + workspaceVolume: + emptyDirWorkspaceVolume: + memory: false + yaml: | + apiVersion: v1 + kind: Pod + spec: + containers: + - name: jnlp + resources: + limits: + cpu: "2000m" + memory: "4096Mi" + requests: + cpu: "1000m" + memory: "4096Mi" + volumeMounts: + - name: m2-secret-dir + mountPath: /home/jenkins/.m2/settings-security.xml + subPath: settings-security.xml + readOnly: true + - name: m2-secret-dir + mountPath: /home/jenkins/.m2/settings.xml + subPath: settings.xml + readOnly: true + - name: m2-dir + mountPath: /home/jenkins/.m2/toolchains.xml + subPath: toolchains.xml + readOnly: true + - name: m2-dir + mountPath: /home/jenkins/.mavenrc + subPath: .mavenrc + readOnly: true + volumes: + - name: m2-secret-dir + secret: + secretName: m2-secret-dir + - name: m2-dir + configMap: + name: m2-dir + inheritYamlMergeStrategy: "true" + yamlMergeStrategy: "merge" + - name: "ubuntu-2404" + namespace: "soteria" + label: "ubuntu-latest ubuntu-2404" + containers: + - name: "jnlp" + image: docker.io/eclipsecbi/jiro-agent-ubuntu-2404:remoting-3206.3208.v409508a_675ff + alwaysPullImage: true + livenessProbe: + failureThreshold: 0 + initialDelaySeconds: 0 + periodSeconds: 0 + successThreshold: 0 + timeoutSeconds: 0 + ttyEnabled: true + command: "" + args: "" + instanceCap: -1 + nodeUsageMode: EXCLUSIVE + envVars: + - envVar: + key: "JAVA_TOOL_OPTIONS" + 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" + - envVar: + key: "OPENJ9_JAVA_OPTIONS" + value: "-XX:+IgnoreUnrecognizedVMOptions -XX:+IdleTuningCompactOnIdle -XX:+IdleTuningGcOnIdle" + - envVar: + key: "_JAVA_OPTIONS" + value: "" + volumes: + - persistentVolumeClaim: + claimName: "tools-claim-jiro-soteria" + mountPath: "/opt/tools" + readOnly: true + - configMapVolume: + configMapName: "known-hosts" + mountPath: "/home/jenkins/.ssh/" + subPath: "." + - emptyDirVolume: + memory: false + mountPath: "/home/jenkins/" + - emptyDirVolume: + memory: false + mountPath: "/home/jenkins/.m2/repository" + - emptyDirVolume: + memory: false + mountPath: "/home/jenkins/.m2/wrapper" + workspaceVolume: + emptyDirWorkspaceVolume: + memory: false + yaml: | + apiVersion: v1 + kind: Pod + spec: + containers: + - name: jnlp + resources: + limits: + cpu: "2000m" + memory: "4096Mi" + requests: + cpu: "1000m" + memory: "4096Mi" + volumeMounts: + - name: m2-secret-dir + mountPath: /home/jenkins/.m2/settings-security.xml + subPath: settings-security.xml + readOnly: true + - name: m2-secret-dir + mountPath: /home/jenkins/.m2/settings.xml + subPath: settings.xml + readOnly: true + - name: m2-dir + mountPath: /home/jenkins/.m2/toolchains.xml + subPath: toolchains.xml + readOnly: true + - name: m2-dir + mountPath: /home/jenkins/.mavenrc + subPath: .mavenrc + readOnly: true + volumes: + - name: m2-secret-dir + secret: + secretName: m2-secret-dir + - name: m2-dir + configMap: + name: m2-dir + inheritYamlMergeStrategy: "true" + yamlMergeStrategy: "merge" security: apiToken: creationOfLegacyTokenEnabled: false @@ -558,6 +740,8 @@ data: home: "/opt/tools/java/openjdk/latest" - name: "openjdk-ea-latest" home: "/opt/tools/java/openjdk/ea-latest" + - name: "openjdk-jdk24-latest" + home: "/opt/tools/java/openjdk/jdk-24/latest" - name: "openjdk-jdk23-latest" home: "/opt/tools/java/openjdk/jdk-23/latest" - name: "openjdk-jdk22-latest" @@ -687,6 +871,8 @@ data: installations: - name: "apache-maven-latest" home: "/opt/tools/apache-maven/latest" + - name: "apache-maven-3.9.9" + home: "/opt/tools/apache-maven/3.9.9" - name: "apache-maven-3.9.6" home: "/opt/tools/apache-maven/3.9.6" - name: "apache-maven-3.9.5" diff --git a/instances/ee4j.soteria/target/k8s/m2-dir.json b/instances/ee4j.soteria/target/k8s/m2-dir.json index 5b535ee01..a1ce8058c 100644 --- a/instances/ee4j.soteria/target/k8s/m2-dir.json +++ b/instances/ee4j.soteria/target/k8s/m2-dir.json @@ -2,7 +2,7 @@ "apiVersion": "v1", "data": { ".mavenrc": "set -- -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn --batch-mode \"${@}\"", - "toolchains.xml": "\n\n \n jdk\n \n JavaSE-1.8\n 1.8\n oracle\n \n /opt/tools/java/oracle/jdk-8/latest\n \n \n jdk\n \n JavaSE-9\n 9\n openjdk\n \n /opt/tools/java/openjdk/jdk-9/latest\n \n \n jdk\n \n JavaSE-10\n 10\n openjdk\n \n /opt/tools/java/openjdk/jdk-10/latest\n \n \n jdk\n \n JavaSE-11\n 11\n openjdk\n \n /opt/tools/java/openjdk/jdk-11/latest\n \n \n jdk\n \n JavaSE-12\n 12\n openjdk\n \n /opt/tools/java/openjdk/jdk-12/latest\n \n \n jdk\n \n JavaSE-13\n 13\n openjdk\n \n /opt/tools/java/openjdk/jdk-13/latest\n \n \n jdk\n \n JavaSE-14\n 14\n openjdk\n \n /opt/tools/java/openjdk/jdk-14/latest\n \n \n jdk\n \n JavaSE-15\n 15\n openjdk\n \n /opt/tools/java/openjdk/jdk-15/latest\n \n \n jdk\n \n JavaSE-16\n 16\n openjdk\n \n /opt/tools/java/openjdk/jdk-16/latest\n \n \n jdk\n \n JavaSE-17\n 17\n openjdk\n \n /opt/tools/java/openjdk/jdk-17/latest\n \n \n jdk\n \n JavaSE-18\n 18\n openjdk\n \n /opt/tools/java/openjdk/jdk-18/latest\n \n \n jdk\n \n JavaSE-19\n 19\n openjdk\n \n /opt/tools/java/openjdk/jdk-19/latest\n \n \n jdk\n \n JavaSE-20\n 20\n openjdk\n \n /opt/tools/java/openjdk/jdk-20/latest\n \n \n jdk\n \n JavaSE-21\n 21\n openjdk\n \n /opt/tools/java/openjdk/jdk-21/latest\n \n \n jdk\n \n JavaSE-22\n 22\n openjdk\n \n /opt/tools/java/openjdk/jdk-22/latest\n \n \n jdk\n \n JavaSE-23\n 23\n openjdk\n \n /opt/tools/java/openjdk/jdk-23/latest\n \n\n" + "toolchains.xml": "\n\n \n jdk\n \n JavaSE-1.8\n 1.8\n oracle\n \n /opt/tools/java/oracle/jdk-8/latest\n \n \n jdk\n \n JavaSE-9\n 9\n openjdk\n \n /opt/tools/java/openjdk/jdk-9/latest\n \n \n jdk\n \n JavaSE-10\n 10\n openjdk\n \n /opt/tools/java/openjdk/jdk-10/latest\n \n \n jdk\n \n JavaSE-11\n 11\n openjdk\n \n /opt/tools/java/openjdk/jdk-11/latest\n \n \n jdk\n \n JavaSE-12\n 12\n openjdk\n \n /opt/tools/java/openjdk/jdk-12/latest\n \n \n jdk\n \n JavaSE-13\n 13\n openjdk\n \n /opt/tools/java/openjdk/jdk-13/latest\n \n \n jdk\n \n JavaSE-14\n 14\n openjdk\n \n /opt/tools/java/openjdk/jdk-14/latest\n \n \n jdk\n \n JavaSE-15\n 15\n openjdk\n \n /opt/tools/java/openjdk/jdk-15/latest\n \n \n jdk\n \n JavaSE-16\n 16\n openjdk\n \n /opt/tools/java/openjdk/jdk-16/latest\n \n \n jdk\n \n JavaSE-17\n 17\n openjdk\n \n /opt/tools/java/openjdk/jdk-17/latest\n \n \n jdk\n \n JavaSE-18\n 18\n openjdk\n \n /opt/tools/java/openjdk/jdk-18/latest\n \n \n jdk\n \n JavaSE-19\n 19\n openjdk\n \n /opt/tools/java/openjdk/jdk-19/latest\n \n \n jdk\n \n JavaSE-20\n 20\n openjdk\n \n /opt/tools/java/openjdk/jdk-20/latest\n \n \n jdk\n \n JavaSE-21\n 21\n openjdk\n \n /opt/tools/java/openjdk/jdk-21/latest\n \n \n jdk\n \n JavaSE-22\n 22\n openjdk\n \n /opt/tools/java/openjdk/jdk-22/latest\n \n \n jdk\n \n JavaSE-23\n 23\n openjdk\n \n /opt/tools/java/openjdk/jdk-23/latest\n \n \n jdk\n \n JavaSE-24\n 24\n openjdk\n \n /opt/tools/java/openjdk/jdk-24/latest\n \n\n" }, "kind": "ConfigMap", "metadata": { diff --git a/instances/ee4j.soteria/target/k8s/statefulset.json b/instances/ee4j.soteria/target/k8s/statefulset.json index 2ba8f48ac..a10a73931 100644 --- a/instances/ee4j.soteria/target/k8s/statefulset.json +++ b/instances/ee4j.soteria/target/k8s/statefulset.json @@ -119,6 +119,12 @@ "cpu": "250m" } }, + "securityContext": { + "seLinuxOptions": { + "level": "s0:c53,c52", + "type": "spc_t" + } + }, "volumeMounts": [ { "mountPath": "/var/jenkins", diff --git a/instances/ee4j.starter/config.jsonnet b/instances/ee4j.starter/config.jsonnet index fd79d91bb..0973ea180 100644 --- a/instances/ee4j.starter/config.jsonnet +++ b/instances/ee4j.starter/config.jsonnet @@ -3,4 +3,5 @@ fullName: "ee4j.starter", displayName: "Eclipse Starter for Jakarta EE", }, + seLinuxLevel: "s0:c54,c19", } diff --git a/instances/ee4j.starter/target/config.json b/instances/ee4j.starter/target/config.json index 7f0f6a087..adc0c7966 100644 --- a/instances/ee4j.starter/target/config.json +++ b/instances/ee4j.starter/target/config.json @@ -217,7 +217,7 @@ "docker.io/eclipsecbi/jiro-agent-centos-7:latest" ], "context": "centos-7", - "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-centos-7: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 [ \"uid_entrypoint\", \"/usr/local/bin/jenkins-agent\" ]\n\nADD \"https://repo.jenkins-ci.org/public/org/jenkins-ci/main/remoting/3206.3208.v409508a_675ff/remoting-3206.3208.v409508a_675ff.jar\" \"/usr/share/jenkins/agent.jar\" \nADD \"https://github.com/jenkinsci/docker-agent/raw/3206.vb_15dcf73f6a_9-12/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\nUSER 10001:0\n", + "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-centos-7: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/3206.3208.v409508a_675ff/remoting-3206.3208.v409508a_675ff.jar\" \"/usr/share/jenkins/agent.jar\"\nADD \"https://github.com/jenkinsci/docker-agent/raw/3206.vb_15dcf73f6a_9-12/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\nUSER 10001:0\n", "image": "jiro-agent-centos-7", "registry": "docker.io", "repository": "eclipsecbi", @@ -316,7 +316,7 @@ "docker.io/eclipsecbi/jiro-agent-centos-8:latest" ], "context": "centos-8", - "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-centos-8: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 [ \"uid_entrypoint\", \"/usr/local/bin/jenkins-agent\" ]\n\nADD \"https://repo.jenkins-ci.org/public/org/jenkins-ci/main/remoting/3206.3208.v409508a_675ff/remoting-3206.3208.v409508a_675ff.jar\" \"/usr/share/jenkins/agent.jar\" \nADD \"https://github.com/jenkinsci/docker-agent/raw/3206.vb_15dcf73f6a_9-12/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\nUSER 10001:0\n", + "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-centos-8: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/3206.3208.v409508a_675ff/remoting-3206.3208.v409508a_675ff.jar\" \"/usr/share/jenkins/agent.jar\"\nADD \"https://github.com/jenkinsci/docker-agent/raw/3206.vb_15dcf73f6a_9-12/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\nUSER 10001:0\n", "image": "jiro-agent-centos-8", "registry": "docker.io", "repository": "eclipsecbi", @@ -406,6 +406,203 @@ }, "startupScript": "/usr/local/bin/jenkins-agent", "username": "jenkins" + }, + "ubuntu-2204": { + "agentWorkdir": "/home/jenkins/jenkins-agent", + "docker": { + "aliases": [ + "docker.io/eclipsecbi/jiro-agent-ubuntu-2204:latest" + ], + "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-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/3206.3208.v409508a_675ff/remoting-3206.3208.v409508a_675ff.jar\" \"/usr/share/jenkins/agent.jar\"\nADD \"https://github.com/jenkinsci/docker-agent/raw/3206.vb_15dcf73f6a_9-12/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\nUSER 10001:0\n", + "image": "jiro-agent-ubuntu-2204", + "registry": "docker.io", + "repository": "eclipsecbi", + "tag": "remoting-3206.3208.v409508a_675ff" + }, + "env": { + "JAVA_TOOL_OPTIONS": [ ], + "JENKINS_REMOTING_JAVA_OPTS": [ + "-showversion", + "-XshowSettings:vm", + "-Xmx256m", + "-Dorg.jenkinsci.remoting.engine.JnlpProtocol3.disabled=true", + "-Dorg.jenkinsci.plugins.gitclient.CliGitAPIImpl.useSETSID=true" + ], + "OPENJ9_JAVA_OPTIONS": [ + "-XX:+IgnoreUnrecognizedVMOptions", + "-XX:+IdleTuningCompactOnIdle", + "-XX:+IdleTuningGcOnIdle" + ], + "_JAVA_OPTIONS": [ ] + }, + "home": "/home/jenkins", + "kubernetes": { + "inheritYamlMergeStrategy": true, + "resources": { + "cpu": { + "limit": "2000m", + "request": "1000m" + }, + "memory": { + "limit": "4096Mi", + "request": "4096Mi" + } + }, + "volumes": [ + { + "mounts": [ + { + "mountPath": "/home/jenkins/.m2/settings-security.xml", + "subPath": "settings-security.xml" + }, + { + "mountPath": "/home/jenkins/.m2/settings.xml", + "subPath": "settings.xml" + } + ], + "name": "m2-secret-dir", + "secret": { + "name": "m2-secret-dir" + } + }, + { + "configMap": { + "name": "m2-dir" + }, + "mounts": [ + { + "mountPath": "/home/jenkins/.m2/toolchains.xml", + "subPath": "toolchains.xml" + }, + { + "mountPath": "/home/jenkins/.mavenrc", + "subPath": ".mavenrc" + } + ], + "name": "m2-dir" + } + ], + "yamlMergeStrategy": "merge" + }, + "labels": [ + "ubuntu-2204" + ], + "maxHeap": "256m", + "mode": "EXCLUSIVE", + "name": "ubuntu-2204", + "remoting": { + "jar": "/usr/share/jenkins/agent.jar", + "startupScript": { + "name": "jenkins-agent", + "url": "https://github.com/jenkinsci/docker-agent/raw/3206.vb_15dcf73f6a_9-12/jenkins-agent", + "version": "3206.vb_15dcf73f6a_9-12" + }, + "url": "https://repo.jenkins-ci.org/public/org/jenkins-ci/main/remoting/3206.3208.v409508a_675ff/remoting-3206.3208.v409508a_675ff.jar", + "version": "3206.3208.v409508a_675ff" + }, + "startupScript": "/usr/local/bin/jenkins-agent", + "username": "jenkins" + }, + "ubuntu-2404": { + "agentWorkdir": "/home/jenkins/jenkins-agent", + "docker": { + "aliases": [ + "docker.io/eclipsecbi/jiro-agent-ubuntu-2404:latest" + ], + "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-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/3206.3208.v409508a_675ff/remoting-3206.3208.v409508a_675ff.jar\" \"/usr/share/jenkins/agent.jar\"\nADD \"https://github.com/jenkinsci/docker-agent/raw/3206.vb_15dcf73f6a_9-12/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\nUSER 10001:0\n", + "image": "jiro-agent-ubuntu-2404", + "registry": "docker.io", + "repository": "eclipsecbi", + "tag": "remoting-3206.3208.v409508a_675ff" + }, + "env": { + "JAVA_TOOL_OPTIONS": [ ], + "JENKINS_REMOTING_JAVA_OPTS": [ + "-showversion", + "-XshowSettings:vm", + "-Xmx256m", + "-Dorg.jenkinsci.remoting.engine.JnlpProtocol3.disabled=true", + "-Dorg.jenkinsci.plugins.gitclient.CliGitAPIImpl.useSETSID=true" + ], + "OPENJ9_JAVA_OPTIONS": [ + "-XX:+IgnoreUnrecognizedVMOptions", + "-XX:+IdleTuningCompactOnIdle", + "-XX:+IdleTuningGcOnIdle" + ], + "_JAVA_OPTIONS": [ ] + }, + "home": "/home/jenkins", + "kubernetes": { + "inheritYamlMergeStrategy": true, + "resources": { + "cpu": { + "limit": "2000m", + "request": "1000m" + }, + "memory": { + "limit": "4096Mi", + "request": "4096Mi" + } + }, + "volumes": [ + { + "mounts": [ + { + "mountPath": "/home/jenkins/.m2/settings-security.xml", + "subPath": "settings-security.xml" + }, + { + "mountPath": "/home/jenkins/.m2/settings.xml", + "subPath": "settings.xml" + } + ], + "name": "m2-secret-dir", + "secret": { + "name": "m2-secret-dir" + } + }, + { + "configMap": { + "name": "m2-dir" + }, + "mounts": [ + { + "mountPath": "/home/jenkins/.m2/toolchains.xml", + "subPath": "toolchains.xml" + }, + { + "mountPath": "/home/jenkins/.mavenrc", + "subPath": ".mavenrc" + } + ], + "name": "m2-dir" + } + ], + "yamlMergeStrategy": "merge" + }, + "labels": [ + "ubuntu-latest", + "ubuntu-2404" + ], + "maxHeap": "256m", + "mode": "EXCLUSIVE", + "name": "ubuntu-2404", + "remoting": { + "jar": "/usr/share/jenkins/agent.jar", + "startupScript": { + "name": "jenkins-agent", + "url": "https://github.com/jenkinsci/docker-agent/raw/3206.vb_15dcf73f6a_9-12/jenkins-agent", + "version": "3206.vb_15dcf73f6a_9-12" + }, + "url": "https://repo.jenkins-ci.org/public/org/jenkins-ci/main/remoting/3206.3208.v409508a_675ff/remoting-3206.3208.v409508a_675ff.jar", + "version": "3206.3208.v409508a_675ff" + }, + "startupScript": "/usr/local/bin/jenkins-agent", + "username": "jenkins" } } } @@ -701,6 +898,7 @@ }, "generate": false }, + "seLinuxLevel": "s0:c54,c19", "secrets": { "dockerconfigjson": { "dockerconfigjson-for-pull-as-default": { diff --git a/instances/ee4j.starter/target/jenkins/configuration.yml b/instances/ee4j.starter/target/jenkins/configuration.yml index d494f7d2c..03a07cbca 100644 --- a/instances/ee4j.starter/target/jenkins/configuration.yml +++ b/instances/ee4j.starter/target/jenkins/configuration.yml @@ -441,6 +441,188 @@ jenkins: name: m2-dir inheritYamlMergeStrategy: "true" yamlMergeStrategy: "merge" + - name: "ubuntu-2204" + namespace: "starter" + label: "ubuntu-2204" + containers: + - name: "jnlp" + image: docker.io/eclipsecbi/jiro-agent-ubuntu-2204:remoting-3206.3208.v409508a_675ff + alwaysPullImage: true + livenessProbe: + failureThreshold: 0 + initialDelaySeconds: 0 + periodSeconds: 0 + successThreshold: 0 + timeoutSeconds: 0 + ttyEnabled: true + command: "" + args: "" + instanceCap: -1 + nodeUsageMode: EXCLUSIVE + envVars: + - envVar: + key: "JAVA_TOOL_OPTIONS" + 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" + - envVar: + key: "OPENJ9_JAVA_OPTIONS" + value: "-XX:+IgnoreUnrecognizedVMOptions -XX:+IdleTuningCompactOnIdle -XX:+IdleTuningGcOnIdle" + - envVar: + key: "_JAVA_OPTIONS" + value: "" + volumes: + - persistentVolumeClaim: + claimName: "tools-claim-jiro-starter" + mountPath: "/opt/tools" + readOnly: true + - configMapVolume: + configMapName: "known-hosts" + mountPath: "/home/jenkins/.ssh/" + subPath: "." + - emptyDirVolume: + memory: false + mountPath: "/home/jenkins/" + - emptyDirVolume: + memory: false + mountPath: "/home/jenkins/.m2/repository" + - emptyDirVolume: + memory: false + mountPath: "/home/jenkins/.m2/wrapper" + workspaceVolume: + emptyDirWorkspaceVolume: + memory: false + yaml: | + apiVersion: v1 + kind: Pod + spec: + containers: + - name: jnlp + resources: + limits: + cpu: "2000m" + memory: "4096Mi" + requests: + cpu: "1000m" + memory: "4096Mi" + volumeMounts: + - name: m2-secret-dir + mountPath: /home/jenkins/.m2/settings-security.xml + subPath: settings-security.xml + readOnly: true + - name: m2-secret-dir + mountPath: /home/jenkins/.m2/settings.xml + subPath: settings.xml + readOnly: true + - name: m2-dir + mountPath: /home/jenkins/.m2/toolchains.xml + subPath: toolchains.xml + readOnly: true + - name: m2-dir + mountPath: /home/jenkins/.mavenrc + subPath: .mavenrc + readOnly: true + volumes: + - name: m2-secret-dir + secret: + secretName: m2-secret-dir + - name: m2-dir + configMap: + name: m2-dir + inheritYamlMergeStrategy: "true" + yamlMergeStrategy: "merge" + - name: "ubuntu-2404" + namespace: "starter" + label: "ubuntu-latest ubuntu-2404" + containers: + - name: "jnlp" + image: docker.io/eclipsecbi/jiro-agent-ubuntu-2404:remoting-3206.3208.v409508a_675ff + alwaysPullImage: true + livenessProbe: + failureThreshold: 0 + initialDelaySeconds: 0 + periodSeconds: 0 + successThreshold: 0 + timeoutSeconds: 0 + ttyEnabled: true + command: "" + args: "" + instanceCap: -1 + nodeUsageMode: EXCLUSIVE + envVars: + - envVar: + key: "JAVA_TOOL_OPTIONS" + 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" + - envVar: + key: "OPENJ9_JAVA_OPTIONS" + value: "-XX:+IgnoreUnrecognizedVMOptions -XX:+IdleTuningCompactOnIdle -XX:+IdleTuningGcOnIdle" + - envVar: + key: "_JAVA_OPTIONS" + value: "" + volumes: + - persistentVolumeClaim: + claimName: "tools-claim-jiro-starter" + mountPath: "/opt/tools" + readOnly: true + - configMapVolume: + configMapName: "known-hosts" + mountPath: "/home/jenkins/.ssh/" + subPath: "." + - emptyDirVolume: + memory: false + mountPath: "/home/jenkins/" + - emptyDirVolume: + memory: false + mountPath: "/home/jenkins/.m2/repository" + - emptyDirVolume: + memory: false + mountPath: "/home/jenkins/.m2/wrapper" + workspaceVolume: + emptyDirWorkspaceVolume: + memory: false + yaml: | + apiVersion: v1 + kind: Pod + spec: + containers: + - name: jnlp + resources: + limits: + cpu: "2000m" + memory: "4096Mi" + requests: + cpu: "1000m" + memory: "4096Mi" + volumeMounts: + - name: m2-secret-dir + mountPath: /home/jenkins/.m2/settings-security.xml + subPath: settings-security.xml + readOnly: true + - name: m2-secret-dir + mountPath: /home/jenkins/.m2/settings.xml + subPath: settings.xml + readOnly: true + - name: m2-dir + mountPath: /home/jenkins/.m2/toolchains.xml + subPath: toolchains.xml + readOnly: true + - name: m2-dir + mountPath: /home/jenkins/.mavenrc + subPath: .mavenrc + readOnly: true + volumes: + - name: m2-secret-dir + secret: + secretName: m2-secret-dir + - name: m2-dir + configMap: + name: m2-dir + inheritYamlMergeStrategy: "true" + yamlMergeStrategy: "merge" security: apiToken: creationOfLegacyTokenEnabled: false @@ -535,6 +717,8 @@ tool: home: "/opt/tools/java/openjdk/latest" - name: "openjdk-ea-latest" home: "/opt/tools/java/openjdk/ea-latest" + - name: "openjdk-jdk24-latest" + home: "/opt/tools/java/openjdk/jdk-24/latest" - name: "openjdk-jdk23-latest" home: "/opt/tools/java/openjdk/jdk-23/latest" - name: "openjdk-jdk22-latest" @@ -664,6 +848,8 @@ tool: installations: - name: "apache-maven-latest" home: "/opt/tools/apache-maven/latest" + - name: "apache-maven-3.9.9" + home: "/opt/tools/apache-maven/3.9.9" - name: "apache-maven-3.9.6" home: "/opt/tools/apache-maven/3.9.6" - name: "apache-maven-3.9.5" diff --git a/instances/ee4j.starter/target/k8s/configmap-jenkins-config.yml b/instances/ee4j.starter/target/k8s/configmap-jenkins-config.yml index 3109f1bec..0b5e0418a 100644 --- a/instances/ee4j.starter/target/k8s/configmap-jenkins-config.yml +++ b/instances/ee4j.starter/target/k8s/configmap-jenkins-config.yml @@ -464,6 +464,188 @@ data: name: m2-dir inheritYamlMergeStrategy: "true" yamlMergeStrategy: "merge" + - name: "ubuntu-2204" + namespace: "starter" + label: "ubuntu-2204" + containers: + - name: "jnlp" + image: docker.io/eclipsecbi/jiro-agent-ubuntu-2204:remoting-3206.3208.v409508a_675ff + alwaysPullImage: true + livenessProbe: + failureThreshold: 0 + initialDelaySeconds: 0 + periodSeconds: 0 + successThreshold: 0 + timeoutSeconds: 0 + ttyEnabled: true + command: "" + args: "" + instanceCap: -1 + nodeUsageMode: EXCLUSIVE + envVars: + - envVar: + key: "JAVA_TOOL_OPTIONS" + 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" + - envVar: + key: "OPENJ9_JAVA_OPTIONS" + value: "-XX:+IgnoreUnrecognizedVMOptions -XX:+IdleTuningCompactOnIdle -XX:+IdleTuningGcOnIdle" + - envVar: + key: "_JAVA_OPTIONS" + value: "" + volumes: + - persistentVolumeClaim: + claimName: "tools-claim-jiro-starter" + mountPath: "/opt/tools" + readOnly: true + - configMapVolume: + configMapName: "known-hosts" + mountPath: "/home/jenkins/.ssh/" + subPath: "." + - emptyDirVolume: + memory: false + mountPath: "/home/jenkins/" + - emptyDirVolume: + memory: false + mountPath: "/home/jenkins/.m2/repository" + - emptyDirVolume: + memory: false + mountPath: "/home/jenkins/.m2/wrapper" + workspaceVolume: + emptyDirWorkspaceVolume: + memory: false + yaml: | + apiVersion: v1 + kind: Pod + spec: + containers: + - name: jnlp + resources: + limits: + cpu: "2000m" + memory: "4096Mi" + requests: + cpu: "1000m" + memory: "4096Mi" + volumeMounts: + - name: m2-secret-dir + mountPath: /home/jenkins/.m2/settings-security.xml + subPath: settings-security.xml + readOnly: true + - name: m2-secret-dir + mountPath: /home/jenkins/.m2/settings.xml + subPath: settings.xml + readOnly: true + - name: m2-dir + mountPath: /home/jenkins/.m2/toolchains.xml + subPath: toolchains.xml + readOnly: true + - name: m2-dir + mountPath: /home/jenkins/.mavenrc + subPath: .mavenrc + readOnly: true + volumes: + - name: m2-secret-dir + secret: + secretName: m2-secret-dir + - name: m2-dir + configMap: + name: m2-dir + inheritYamlMergeStrategy: "true" + yamlMergeStrategy: "merge" + - name: "ubuntu-2404" + namespace: "starter" + label: "ubuntu-latest ubuntu-2404" + containers: + - name: "jnlp" + image: docker.io/eclipsecbi/jiro-agent-ubuntu-2404:remoting-3206.3208.v409508a_675ff + alwaysPullImage: true + livenessProbe: + failureThreshold: 0 + initialDelaySeconds: 0 + periodSeconds: 0 + successThreshold: 0 + timeoutSeconds: 0 + ttyEnabled: true + command: "" + args: "" + instanceCap: -1 + nodeUsageMode: EXCLUSIVE + envVars: + - envVar: + key: "JAVA_TOOL_OPTIONS" + 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" + - envVar: + key: "OPENJ9_JAVA_OPTIONS" + value: "-XX:+IgnoreUnrecognizedVMOptions -XX:+IdleTuningCompactOnIdle -XX:+IdleTuningGcOnIdle" + - envVar: + key: "_JAVA_OPTIONS" + value: "" + volumes: + - persistentVolumeClaim: + claimName: "tools-claim-jiro-starter" + mountPath: "/opt/tools" + readOnly: true + - configMapVolume: + configMapName: "known-hosts" + mountPath: "/home/jenkins/.ssh/" + subPath: "." + - emptyDirVolume: + memory: false + mountPath: "/home/jenkins/" + - emptyDirVolume: + memory: false + mountPath: "/home/jenkins/.m2/repository" + - emptyDirVolume: + memory: false + mountPath: "/home/jenkins/.m2/wrapper" + workspaceVolume: + emptyDirWorkspaceVolume: + memory: false + yaml: | + apiVersion: v1 + kind: Pod + spec: + containers: + - name: jnlp + resources: + limits: + cpu: "2000m" + memory: "4096Mi" + requests: + cpu: "1000m" + memory: "4096Mi" + volumeMounts: + - name: m2-secret-dir + mountPath: /home/jenkins/.m2/settings-security.xml + subPath: settings-security.xml + readOnly: true + - name: m2-secret-dir + mountPath: /home/jenkins/.m2/settings.xml + subPath: settings.xml + readOnly: true + - name: m2-dir + mountPath: /home/jenkins/.m2/toolchains.xml + subPath: toolchains.xml + readOnly: true + - name: m2-dir + mountPath: /home/jenkins/.mavenrc + subPath: .mavenrc + readOnly: true + volumes: + - name: m2-secret-dir + secret: + secretName: m2-secret-dir + - name: m2-dir + configMap: + name: m2-dir + inheritYamlMergeStrategy: "true" + yamlMergeStrategy: "merge" security: apiToken: creationOfLegacyTokenEnabled: false @@ -558,6 +740,8 @@ data: home: "/opt/tools/java/openjdk/latest" - name: "openjdk-ea-latest" home: "/opt/tools/java/openjdk/ea-latest" + - name: "openjdk-jdk24-latest" + home: "/opt/tools/java/openjdk/jdk-24/latest" - name: "openjdk-jdk23-latest" home: "/opt/tools/java/openjdk/jdk-23/latest" - name: "openjdk-jdk22-latest" @@ -687,6 +871,8 @@ data: installations: - name: "apache-maven-latest" home: "/opt/tools/apache-maven/latest" + - name: "apache-maven-3.9.9" + home: "/opt/tools/apache-maven/3.9.9" - name: "apache-maven-3.9.6" home: "/opt/tools/apache-maven/3.9.6" - name: "apache-maven-3.9.5" diff --git a/instances/ee4j.starter/target/k8s/m2-dir.json b/instances/ee4j.starter/target/k8s/m2-dir.json index 9ef9dc3b9..ba9c7bca6 100644 --- a/instances/ee4j.starter/target/k8s/m2-dir.json +++ b/instances/ee4j.starter/target/k8s/m2-dir.json @@ -2,7 +2,7 @@ "apiVersion": "v1", "data": { ".mavenrc": "set -- -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn --batch-mode \"${@}\"", - "toolchains.xml": "\n\n \n jdk\n \n JavaSE-1.8\n 1.8\n oracle\n \n /opt/tools/java/oracle/jdk-8/latest\n \n \n jdk\n \n JavaSE-9\n 9\n openjdk\n \n /opt/tools/java/openjdk/jdk-9/latest\n \n \n jdk\n \n JavaSE-10\n 10\n openjdk\n \n /opt/tools/java/openjdk/jdk-10/latest\n \n \n jdk\n \n JavaSE-11\n 11\n openjdk\n \n /opt/tools/java/openjdk/jdk-11/latest\n \n \n jdk\n \n JavaSE-12\n 12\n openjdk\n \n /opt/tools/java/openjdk/jdk-12/latest\n \n \n jdk\n \n JavaSE-13\n 13\n openjdk\n \n /opt/tools/java/openjdk/jdk-13/latest\n \n \n jdk\n \n JavaSE-14\n 14\n openjdk\n \n /opt/tools/java/openjdk/jdk-14/latest\n \n \n jdk\n \n JavaSE-15\n 15\n openjdk\n \n /opt/tools/java/openjdk/jdk-15/latest\n \n \n jdk\n \n JavaSE-16\n 16\n openjdk\n \n /opt/tools/java/openjdk/jdk-16/latest\n \n \n jdk\n \n JavaSE-17\n 17\n openjdk\n \n /opt/tools/java/openjdk/jdk-17/latest\n \n \n jdk\n \n JavaSE-18\n 18\n openjdk\n \n /opt/tools/java/openjdk/jdk-18/latest\n \n \n jdk\n \n JavaSE-19\n 19\n openjdk\n \n /opt/tools/java/openjdk/jdk-19/latest\n \n \n jdk\n \n JavaSE-20\n 20\n openjdk\n \n /opt/tools/java/openjdk/jdk-20/latest\n \n \n jdk\n \n JavaSE-21\n 21\n openjdk\n \n /opt/tools/java/openjdk/jdk-21/latest\n \n \n jdk\n \n JavaSE-22\n 22\n openjdk\n \n /opt/tools/java/openjdk/jdk-22/latest\n \n \n jdk\n \n JavaSE-23\n 23\n openjdk\n \n /opt/tools/java/openjdk/jdk-23/latest\n \n\n" + "toolchains.xml": "\n\n \n jdk\n \n JavaSE-1.8\n 1.8\n oracle\n \n /opt/tools/java/oracle/jdk-8/latest\n \n \n jdk\n \n JavaSE-9\n 9\n openjdk\n \n /opt/tools/java/openjdk/jdk-9/latest\n \n \n jdk\n \n JavaSE-10\n 10\n openjdk\n \n /opt/tools/java/openjdk/jdk-10/latest\n \n \n jdk\n \n JavaSE-11\n 11\n openjdk\n \n /opt/tools/java/openjdk/jdk-11/latest\n \n \n jdk\n \n JavaSE-12\n 12\n openjdk\n \n /opt/tools/java/openjdk/jdk-12/latest\n \n \n jdk\n \n JavaSE-13\n 13\n openjdk\n \n /opt/tools/java/openjdk/jdk-13/latest\n \n \n jdk\n \n JavaSE-14\n 14\n openjdk\n \n /opt/tools/java/openjdk/jdk-14/latest\n \n \n jdk\n \n JavaSE-15\n 15\n openjdk\n \n /opt/tools/java/openjdk/jdk-15/latest\n \n \n jdk\n \n JavaSE-16\n 16\n openjdk\n \n /opt/tools/java/openjdk/jdk-16/latest\n \n \n jdk\n \n JavaSE-17\n 17\n openjdk\n \n /opt/tools/java/openjdk/jdk-17/latest\n \n \n jdk\n \n JavaSE-18\n 18\n openjdk\n \n /opt/tools/java/openjdk/jdk-18/latest\n \n \n jdk\n \n JavaSE-19\n 19\n openjdk\n \n /opt/tools/java/openjdk/jdk-19/latest\n \n \n jdk\n \n JavaSE-20\n 20\n openjdk\n \n /opt/tools/java/openjdk/jdk-20/latest\n \n \n jdk\n \n JavaSE-21\n 21\n openjdk\n \n /opt/tools/java/openjdk/jdk-21/latest\n \n \n jdk\n \n JavaSE-22\n 22\n openjdk\n \n /opt/tools/java/openjdk/jdk-22/latest\n \n \n jdk\n \n JavaSE-23\n 23\n openjdk\n \n /opt/tools/java/openjdk/jdk-23/latest\n \n \n jdk\n \n JavaSE-24\n 24\n openjdk\n \n /opt/tools/java/openjdk/jdk-24/latest\n \n\n" }, "kind": "ConfigMap", "metadata": { diff --git a/instances/ee4j.starter/target/k8s/statefulset.json b/instances/ee4j.starter/target/k8s/statefulset.json index 09af0679e..d0475ff77 100644 --- a/instances/ee4j.starter/target/k8s/statefulset.json +++ b/instances/ee4j.starter/target/k8s/statefulset.json @@ -119,6 +119,12 @@ "cpu": "250m" } }, + "securityContext": { + "seLinuxOptions": { + "level": "s0:c54,c19", + "type": "spc_t" + } + }, "volumeMounts": [ { "mountPath": "/var/jenkins", diff --git a/instances/ee4j.wasp/config.jsonnet b/instances/ee4j.wasp/config.jsonnet index 2df466f30..301469b47 100644 --- a/instances/ee4j.wasp/config.jsonnet +++ b/instances/ee4j.wasp/config.jsonnet @@ -7,5 +7,6 @@ plugins+: [ "envinject", ], - } + }, + seLinuxLevel: "s0:c56,c55", } diff --git a/instances/ee4j.wasp/target/config.json b/instances/ee4j.wasp/target/config.json index 257bc81ec..666a1d348 100644 --- a/instances/ee4j.wasp/target/config.json +++ b/instances/ee4j.wasp/target/config.json @@ -217,7 +217,7 @@ "docker.io/eclipsecbi/jiro-agent-centos-7:latest" ], "context": "centos-7", - "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-centos-7: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 [ \"uid_entrypoint\", \"/usr/local/bin/jenkins-agent\" ]\n\nADD \"https://repo.jenkins-ci.org/public/org/jenkins-ci/main/remoting/3206.3208.v409508a_675ff/remoting-3206.3208.v409508a_675ff.jar\" \"/usr/share/jenkins/agent.jar\" \nADD \"https://github.com/jenkinsci/docker-agent/raw/3206.vb_15dcf73f6a_9-12/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\nUSER 10001:0\n", + "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-centos-7: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/3206.3208.v409508a_675ff/remoting-3206.3208.v409508a_675ff.jar\" \"/usr/share/jenkins/agent.jar\"\nADD \"https://github.com/jenkinsci/docker-agent/raw/3206.vb_15dcf73f6a_9-12/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\nUSER 10001:0\n", "image": "jiro-agent-centos-7", "registry": "docker.io", "repository": "eclipsecbi", @@ -316,7 +316,7 @@ "docker.io/eclipsecbi/jiro-agent-centos-8:latest" ], "context": "centos-8", - "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-centos-8: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 [ \"uid_entrypoint\", \"/usr/local/bin/jenkins-agent\" ]\n\nADD \"https://repo.jenkins-ci.org/public/org/jenkins-ci/main/remoting/3206.3208.v409508a_675ff/remoting-3206.3208.v409508a_675ff.jar\" \"/usr/share/jenkins/agent.jar\" \nADD \"https://github.com/jenkinsci/docker-agent/raw/3206.vb_15dcf73f6a_9-12/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\nUSER 10001:0\n", + "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-centos-8: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/3206.3208.v409508a_675ff/remoting-3206.3208.v409508a_675ff.jar\" \"/usr/share/jenkins/agent.jar\"\nADD \"https://github.com/jenkinsci/docker-agent/raw/3206.vb_15dcf73f6a_9-12/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\nUSER 10001:0\n", "image": "jiro-agent-centos-8", "registry": "docker.io", "repository": "eclipsecbi", @@ -406,6 +406,203 @@ }, "startupScript": "/usr/local/bin/jenkins-agent", "username": "jenkins" + }, + "ubuntu-2204": { + "agentWorkdir": "/home/jenkins/jenkins-agent", + "docker": { + "aliases": [ + "docker.io/eclipsecbi/jiro-agent-ubuntu-2204:latest" + ], + "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-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/3206.3208.v409508a_675ff/remoting-3206.3208.v409508a_675ff.jar\" \"/usr/share/jenkins/agent.jar\"\nADD \"https://github.com/jenkinsci/docker-agent/raw/3206.vb_15dcf73f6a_9-12/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\nUSER 10001:0\n", + "image": "jiro-agent-ubuntu-2204", + "registry": "docker.io", + "repository": "eclipsecbi", + "tag": "remoting-3206.3208.v409508a_675ff" + }, + "env": { + "JAVA_TOOL_OPTIONS": [ ], + "JENKINS_REMOTING_JAVA_OPTS": [ + "-showversion", + "-XshowSettings:vm", + "-Xmx256m", + "-Dorg.jenkinsci.remoting.engine.JnlpProtocol3.disabled=true", + "-Dorg.jenkinsci.plugins.gitclient.CliGitAPIImpl.useSETSID=true" + ], + "OPENJ9_JAVA_OPTIONS": [ + "-XX:+IgnoreUnrecognizedVMOptions", + "-XX:+IdleTuningCompactOnIdle", + "-XX:+IdleTuningGcOnIdle" + ], + "_JAVA_OPTIONS": [ ] + }, + "home": "/home/jenkins", + "kubernetes": { + "inheritYamlMergeStrategy": true, + "resources": { + "cpu": { + "limit": "2000m", + "request": "1000m" + }, + "memory": { + "limit": "4096Mi", + "request": "4096Mi" + } + }, + "volumes": [ + { + "mounts": [ + { + "mountPath": "/home/jenkins/.m2/settings-security.xml", + "subPath": "settings-security.xml" + }, + { + "mountPath": "/home/jenkins/.m2/settings.xml", + "subPath": "settings.xml" + } + ], + "name": "m2-secret-dir", + "secret": { + "name": "m2-secret-dir" + } + }, + { + "configMap": { + "name": "m2-dir" + }, + "mounts": [ + { + "mountPath": "/home/jenkins/.m2/toolchains.xml", + "subPath": "toolchains.xml" + }, + { + "mountPath": "/home/jenkins/.mavenrc", + "subPath": ".mavenrc" + } + ], + "name": "m2-dir" + } + ], + "yamlMergeStrategy": "merge" + }, + "labels": [ + "ubuntu-2204" + ], + "maxHeap": "256m", + "mode": "EXCLUSIVE", + "name": "ubuntu-2204", + "remoting": { + "jar": "/usr/share/jenkins/agent.jar", + "startupScript": { + "name": "jenkins-agent", + "url": "https://github.com/jenkinsci/docker-agent/raw/3206.vb_15dcf73f6a_9-12/jenkins-agent", + "version": "3206.vb_15dcf73f6a_9-12" + }, + "url": "https://repo.jenkins-ci.org/public/org/jenkins-ci/main/remoting/3206.3208.v409508a_675ff/remoting-3206.3208.v409508a_675ff.jar", + "version": "3206.3208.v409508a_675ff" + }, + "startupScript": "/usr/local/bin/jenkins-agent", + "username": "jenkins" + }, + "ubuntu-2404": { + "agentWorkdir": "/home/jenkins/jenkins-agent", + "docker": { + "aliases": [ + "docker.io/eclipsecbi/jiro-agent-ubuntu-2404:latest" + ], + "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-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/3206.3208.v409508a_675ff/remoting-3206.3208.v409508a_675ff.jar\" \"/usr/share/jenkins/agent.jar\"\nADD \"https://github.com/jenkinsci/docker-agent/raw/3206.vb_15dcf73f6a_9-12/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\nUSER 10001:0\n", + "image": "jiro-agent-ubuntu-2404", + "registry": "docker.io", + "repository": "eclipsecbi", + "tag": "remoting-3206.3208.v409508a_675ff" + }, + "env": { + "JAVA_TOOL_OPTIONS": [ ], + "JENKINS_REMOTING_JAVA_OPTS": [ + "-showversion", + "-XshowSettings:vm", + "-Xmx256m", + "-Dorg.jenkinsci.remoting.engine.JnlpProtocol3.disabled=true", + "-Dorg.jenkinsci.plugins.gitclient.CliGitAPIImpl.useSETSID=true" + ], + "OPENJ9_JAVA_OPTIONS": [ + "-XX:+IgnoreUnrecognizedVMOptions", + "-XX:+IdleTuningCompactOnIdle", + "-XX:+IdleTuningGcOnIdle" + ], + "_JAVA_OPTIONS": [ ] + }, + "home": "/home/jenkins", + "kubernetes": { + "inheritYamlMergeStrategy": true, + "resources": { + "cpu": { + "limit": "2000m", + "request": "1000m" + }, + "memory": { + "limit": "4096Mi", + "request": "4096Mi" + } + }, + "volumes": [ + { + "mounts": [ + { + "mountPath": "/home/jenkins/.m2/settings-security.xml", + "subPath": "settings-security.xml" + }, + { + "mountPath": "/home/jenkins/.m2/settings.xml", + "subPath": "settings.xml" + } + ], + "name": "m2-secret-dir", + "secret": { + "name": "m2-secret-dir" + } + }, + { + "configMap": { + "name": "m2-dir" + }, + "mounts": [ + { + "mountPath": "/home/jenkins/.m2/toolchains.xml", + "subPath": "toolchains.xml" + }, + { + "mountPath": "/home/jenkins/.mavenrc", + "subPath": ".mavenrc" + } + ], + "name": "m2-dir" + } + ], + "yamlMergeStrategy": "merge" + }, + "labels": [ + "ubuntu-latest", + "ubuntu-2404" + ], + "maxHeap": "256m", + "mode": "EXCLUSIVE", + "name": "ubuntu-2404", + "remoting": { + "jar": "/usr/share/jenkins/agent.jar", + "startupScript": { + "name": "jenkins-agent", + "url": "https://github.com/jenkinsci/docker-agent/raw/3206.vb_15dcf73f6a_9-12/jenkins-agent", + "version": "3206.vb_15dcf73f6a_9-12" + }, + "url": "https://repo.jenkins-ci.org/public/org/jenkins-ci/main/remoting/3206.3208.v409508a_675ff/remoting-3206.3208.v409508a_675ff.jar", + "version": "3206.3208.v409508a_675ff" + }, + "startupScript": "/usr/local/bin/jenkins-agent", + "username": "jenkins" } } } @@ -702,6 +899,7 @@ }, "generate": false }, + "seLinuxLevel": "s0:c56,c55", "secrets": { "dockerconfigjson": { "dockerconfigjson-for-pull-as-default": { diff --git a/instances/ee4j.wasp/target/jenkins/configuration.yml b/instances/ee4j.wasp/target/jenkins/configuration.yml index 535ad0a46..6ab9b1bfb 100644 --- a/instances/ee4j.wasp/target/jenkins/configuration.yml +++ b/instances/ee4j.wasp/target/jenkins/configuration.yml @@ -441,6 +441,188 @@ jenkins: name: m2-dir inheritYamlMergeStrategy: "true" yamlMergeStrategy: "merge" + - name: "ubuntu-2204" + namespace: "wasp" + label: "ubuntu-2204" + containers: + - name: "jnlp" + image: docker.io/eclipsecbi/jiro-agent-ubuntu-2204:remoting-3206.3208.v409508a_675ff + alwaysPullImage: true + livenessProbe: + failureThreshold: 0 + initialDelaySeconds: 0 + periodSeconds: 0 + successThreshold: 0 + timeoutSeconds: 0 + ttyEnabled: true + command: "" + args: "" + instanceCap: -1 + nodeUsageMode: EXCLUSIVE + envVars: + - envVar: + key: "JAVA_TOOL_OPTIONS" + 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" + - envVar: + key: "OPENJ9_JAVA_OPTIONS" + value: "-XX:+IgnoreUnrecognizedVMOptions -XX:+IdleTuningCompactOnIdle -XX:+IdleTuningGcOnIdle" + - envVar: + key: "_JAVA_OPTIONS" + value: "" + volumes: + - persistentVolumeClaim: + claimName: "tools-claim-jiro-wasp" + mountPath: "/opt/tools" + readOnly: true + - configMapVolume: + configMapName: "known-hosts" + mountPath: "/home/jenkins/.ssh/" + subPath: "." + - emptyDirVolume: + memory: false + mountPath: "/home/jenkins/" + - emptyDirVolume: + memory: false + mountPath: "/home/jenkins/.m2/repository" + - emptyDirVolume: + memory: false + mountPath: "/home/jenkins/.m2/wrapper" + workspaceVolume: + emptyDirWorkspaceVolume: + memory: false + yaml: | + apiVersion: v1 + kind: Pod + spec: + containers: + - name: jnlp + resources: + limits: + cpu: "2000m" + memory: "4096Mi" + requests: + cpu: "1000m" + memory: "4096Mi" + volumeMounts: + - name: m2-secret-dir + mountPath: /home/jenkins/.m2/settings-security.xml + subPath: settings-security.xml + readOnly: true + - name: m2-secret-dir + mountPath: /home/jenkins/.m2/settings.xml + subPath: settings.xml + readOnly: true + - name: m2-dir + mountPath: /home/jenkins/.m2/toolchains.xml + subPath: toolchains.xml + readOnly: true + - name: m2-dir + mountPath: /home/jenkins/.mavenrc + subPath: .mavenrc + readOnly: true + volumes: + - name: m2-secret-dir + secret: + secretName: m2-secret-dir + - name: m2-dir + configMap: + name: m2-dir + inheritYamlMergeStrategy: "true" + yamlMergeStrategy: "merge" + - name: "ubuntu-2404" + namespace: "wasp" + label: "ubuntu-latest ubuntu-2404" + containers: + - name: "jnlp" + image: docker.io/eclipsecbi/jiro-agent-ubuntu-2404:remoting-3206.3208.v409508a_675ff + alwaysPullImage: true + livenessProbe: + failureThreshold: 0 + initialDelaySeconds: 0 + periodSeconds: 0 + successThreshold: 0 + timeoutSeconds: 0 + ttyEnabled: true + command: "" + args: "" + instanceCap: -1 + nodeUsageMode: EXCLUSIVE + envVars: + - envVar: + key: "JAVA_TOOL_OPTIONS" + 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" + - envVar: + key: "OPENJ9_JAVA_OPTIONS" + value: "-XX:+IgnoreUnrecognizedVMOptions -XX:+IdleTuningCompactOnIdle -XX:+IdleTuningGcOnIdle" + - envVar: + key: "_JAVA_OPTIONS" + value: "" + volumes: + - persistentVolumeClaim: + claimName: "tools-claim-jiro-wasp" + mountPath: "/opt/tools" + readOnly: true + - configMapVolume: + configMapName: "known-hosts" + mountPath: "/home/jenkins/.ssh/" + subPath: "." + - emptyDirVolume: + memory: false + mountPath: "/home/jenkins/" + - emptyDirVolume: + memory: false + mountPath: "/home/jenkins/.m2/repository" + - emptyDirVolume: + memory: false + mountPath: "/home/jenkins/.m2/wrapper" + workspaceVolume: + emptyDirWorkspaceVolume: + memory: false + yaml: | + apiVersion: v1 + kind: Pod + spec: + containers: + - name: jnlp + resources: + limits: + cpu: "2000m" + memory: "4096Mi" + requests: + cpu: "1000m" + memory: "4096Mi" + volumeMounts: + - name: m2-secret-dir + mountPath: /home/jenkins/.m2/settings-security.xml + subPath: settings-security.xml + readOnly: true + - name: m2-secret-dir + mountPath: /home/jenkins/.m2/settings.xml + subPath: settings.xml + readOnly: true + - name: m2-dir + mountPath: /home/jenkins/.m2/toolchains.xml + subPath: toolchains.xml + readOnly: true + - name: m2-dir + mountPath: /home/jenkins/.mavenrc + subPath: .mavenrc + readOnly: true + volumes: + - name: m2-secret-dir + secret: + secretName: m2-secret-dir + - name: m2-dir + configMap: + name: m2-dir + inheritYamlMergeStrategy: "true" + yamlMergeStrategy: "merge" security: apiToken: creationOfLegacyTokenEnabled: false @@ -535,6 +717,8 @@ tool: home: "/opt/tools/java/openjdk/latest" - name: "openjdk-ea-latest" home: "/opt/tools/java/openjdk/ea-latest" + - name: "openjdk-jdk24-latest" + home: "/opt/tools/java/openjdk/jdk-24/latest" - name: "openjdk-jdk23-latest" home: "/opt/tools/java/openjdk/jdk-23/latest" - name: "openjdk-jdk22-latest" @@ -664,6 +848,8 @@ tool: installations: - name: "apache-maven-latest" home: "/opt/tools/apache-maven/latest" + - name: "apache-maven-3.9.9" + home: "/opt/tools/apache-maven/3.9.9" - name: "apache-maven-3.9.6" home: "/opt/tools/apache-maven/3.9.6" - name: "apache-maven-3.9.5" diff --git a/instances/ee4j.wasp/target/k8s/configmap-jenkins-config.yml b/instances/ee4j.wasp/target/k8s/configmap-jenkins-config.yml index 25400804b..6a29a13ff 100644 --- a/instances/ee4j.wasp/target/k8s/configmap-jenkins-config.yml +++ b/instances/ee4j.wasp/target/k8s/configmap-jenkins-config.yml @@ -464,6 +464,188 @@ data: name: m2-dir inheritYamlMergeStrategy: "true" yamlMergeStrategy: "merge" + - name: "ubuntu-2204" + namespace: "wasp" + label: "ubuntu-2204" + containers: + - name: "jnlp" + image: docker.io/eclipsecbi/jiro-agent-ubuntu-2204:remoting-3206.3208.v409508a_675ff + alwaysPullImage: true + livenessProbe: + failureThreshold: 0 + initialDelaySeconds: 0 + periodSeconds: 0 + successThreshold: 0 + timeoutSeconds: 0 + ttyEnabled: true + command: "" + args: "" + instanceCap: -1 + nodeUsageMode: EXCLUSIVE + envVars: + - envVar: + key: "JAVA_TOOL_OPTIONS" + 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" + - envVar: + key: "OPENJ9_JAVA_OPTIONS" + value: "-XX:+IgnoreUnrecognizedVMOptions -XX:+IdleTuningCompactOnIdle -XX:+IdleTuningGcOnIdle" + - envVar: + key: "_JAVA_OPTIONS" + value: "" + volumes: + - persistentVolumeClaim: + claimName: "tools-claim-jiro-wasp" + mountPath: "/opt/tools" + readOnly: true + - configMapVolume: + configMapName: "known-hosts" + mountPath: "/home/jenkins/.ssh/" + subPath: "." + - emptyDirVolume: + memory: false + mountPath: "/home/jenkins/" + - emptyDirVolume: + memory: false + mountPath: "/home/jenkins/.m2/repository" + - emptyDirVolume: + memory: false + mountPath: "/home/jenkins/.m2/wrapper" + workspaceVolume: + emptyDirWorkspaceVolume: + memory: false + yaml: | + apiVersion: v1 + kind: Pod + spec: + containers: + - name: jnlp + resources: + limits: + cpu: "2000m" + memory: "4096Mi" + requests: + cpu: "1000m" + memory: "4096Mi" + volumeMounts: + - name: m2-secret-dir + mountPath: /home/jenkins/.m2/settings-security.xml + subPath: settings-security.xml + readOnly: true + - name: m2-secret-dir + mountPath: /home/jenkins/.m2/settings.xml + subPath: settings.xml + readOnly: true + - name: m2-dir + mountPath: /home/jenkins/.m2/toolchains.xml + subPath: toolchains.xml + readOnly: true + - name: m2-dir + mountPath: /home/jenkins/.mavenrc + subPath: .mavenrc + readOnly: true + volumes: + - name: m2-secret-dir + secret: + secretName: m2-secret-dir + - name: m2-dir + configMap: + name: m2-dir + inheritYamlMergeStrategy: "true" + yamlMergeStrategy: "merge" + - name: "ubuntu-2404" + namespace: "wasp" + label: "ubuntu-latest ubuntu-2404" + containers: + - name: "jnlp" + image: docker.io/eclipsecbi/jiro-agent-ubuntu-2404:remoting-3206.3208.v409508a_675ff + alwaysPullImage: true + livenessProbe: + failureThreshold: 0 + initialDelaySeconds: 0 + periodSeconds: 0 + successThreshold: 0 + timeoutSeconds: 0 + ttyEnabled: true + command: "" + args: "" + instanceCap: -1 + nodeUsageMode: EXCLUSIVE + envVars: + - envVar: + key: "JAVA_TOOL_OPTIONS" + 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" + - envVar: + key: "OPENJ9_JAVA_OPTIONS" + value: "-XX:+IgnoreUnrecognizedVMOptions -XX:+IdleTuningCompactOnIdle -XX:+IdleTuningGcOnIdle" + - envVar: + key: "_JAVA_OPTIONS" + value: "" + volumes: + - persistentVolumeClaim: + claimName: "tools-claim-jiro-wasp" + mountPath: "/opt/tools" + readOnly: true + - configMapVolume: + configMapName: "known-hosts" + mountPath: "/home/jenkins/.ssh/" + subPath: "." + - emptyDirVolume: + memory: false + mountPath: "/home/jenkins/" + - emptyDirVolume: + memory: false + mountPath: "/home/jenkins/.m2/repository" + - emptyDirVolume: + memory: false + mountPath: "/home/jenkins/.m2/wrapper" + workspaceVolume: + emptyDirWorkspaceVolume: + memory: false + yaml: | + apiVersion: v1 + kind: Pod + spec: + containers: + - name: jnlp + resources: + limits: + cpu: "2000m" + memory: "4096Mi" + requests: + cpu: "1000m" + memory: "4096Mi" + volumeMounts: + - name: m2-secret-dir + mountPath: /home/jenkins/.m2/settings-security.xml + subPath: settings-security.xml + readOnly: true + - name: m2-secret-dir + mountPath: /home/jenkins/.m2/settings.xml + subPath: settings.xml + readOnly: true + - name: m2-dir + mountPath: /home/jenkins/.m2/toolchains.xml + subPath: toolchains.xml + readOnly: true + - name: m2-dir + mountPath: /home/jenkins/.mavenrc + subPath: .mavenrc + readOnly: true + volumes: + - name: m2-secret-dir + secret: + secretName: m2-secret-dir + - name: m2-dir + configMap: + name: m2-dir + inheritYamlMergeStrategy: "true" + yamlMergeStrategy: "merge" security: apiToken: creationOfLegacyTokenEnabled: false @@ -558,6 +740,8 @@ data: home: "/opt/tools/java/openjdk/latest" - name: "openjdk-ea-latest" home: "/opt/tools/java/openjdk/ea-latest" + - name: "openjdk-jdk24-latest" + home: "/opt/tools/java/openjdk/jdk-24/latest" - name: "openjdk-jdk23-latest" home: "/opt/tools/java/openjdk/jdk-23/latest" - name: "openjdk-jdk22-latest" @@ -687,6 +871,8 @@ data: installations: - name: "apache-maven-latest" home: "/opt/tools/apache-maven/latest" + - name: "apache-maven-3.9.9" + home: "/opt/tools/apache-maven/3.9.9" - name: "apache-maven-3.9.6" home: "/opt/tools/apache-maven/3.9.6" - name: "apache-maven-3.9.5" diff --git a/instances/ee4j.wasp/target/k8s/m2-dir.json b/instances/ee4j.wasp/target/k8s/m2-dir.json index 396e1395c..c49520eb8 100644 --- a/instances/ee4j.wasp/target/k8s/m2-dir.json +++ b/instances/ee4j.wasp/target/k8s/m2-dir.json @@ -2,7 +2,7 @@ "apiVersion": "v1", "data": { ".mavenrc": "set -- -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn --batch-mode \"${@}\"", - "toolchains.xml": "\n\n \n jdk\n \n JavaSE-1.8\n 1.8\n oracle\n \n /opt/tools/java/oracle/jdk-8/latest\n \n \n jdk\n \n JavaSE-9\n 9\n openjdk\n \n /opt/tools/java/openjdk/jdk-9/latest\n \n \n jdk\n \n JavaSE-10\n 10\n openjdk\n \n /opt/tools/java/openjdk/jdk-10/latest\n \n \n jdk\n \n JavaSE-11\n 11\n openjdk\n \n /opt/tools/java/openjdk/jdk-11/latest\n \n \n jdk\n \n JavaSE-12\n 12\n openjdk\n \n /opt/tools/java/openjdk/jdk-12/latest\n \n \n jdk\n \n JavaSE-13\n 13\n openjdk\n \n /opt/tools/java/openjdk/jdk-13/latest\n \n \n jdk\n \n JavaSE-14\n 14\n openjdk\n \n /opt/tools/java/openjdk/jdk-14/latest\n \n \n jdk\n \n JavaSE-15\n 15\n openjdk\n \n /opt/tools/java/openjdk/jdk-15/latest\n \n \n jdk\n \n JavaSE-16\n 16\n openjdk\n \n /opt/tools/java/openjdk/jdk-16/latest\n \n \n jdk\n \n JavaSE-17\n 17\n openjdk\n \n /opt/tools/java/openjdk/jdk-17/latest\n \n \n jdk\n \n JavaSE-18\n 18\n openjdk\n \n /opt/tools/java/openjdk/jdk-18/latest\n \n \n jdk\n \n JavaSE-19\n 19\n openjdk\n \n /opt/tools/java/openjdk/jdk-19/latest\n \n \n jdk\n \n JavaSE-20\n 20\n openjdk\n \n /opt/tools/java/openjdk/jdk-20/latest\n \n \n jdk\n \n JavaSE-21\n 21\n openjdk\n \n /opt/tools/java/openjdk/jdk-21/latest\n \n \n jdk\n \n JavaSE-22\n 22\n openjdk\n \n /opt/tools/java/openjdk/jdk-22/latest\n \n \n jdk\n \n JavaSE-23\n 23\n openjdk\n \n /opt/tools/java/openjdk/jdk-23/latest\n \n\n" + "toolchains.xml": "\n\n \n jdk\n \n JavaSE-1.8\n 1.8\n oracle\n \n /opt/tools/java/oracle/jdk-8/latest\n \n \n jdk\n \n JavaSE-9\n 9\n openjdk\n \n /opt/tools/java/openjdk/jdk-9/latest\n \n \n jdk\n \n JavaSE-10\n 10\n openjdk\n \n /opt/tools/java/openjdk/jdk-10/latest\n \n \n jdk\n \n JavaSE-11\n 11\n openjdk\n \n /opt/tools/java/openjdk/jdk-11/latest\n \n \n jdk\n \n JavaSE-12\n 12\n openjdk\n \n /opt/tools/java/openjdk/jdk-12/latest\n \n \n jdk\n \n JavaSE-13\n 13\n openjdk\n \n /opt/tools/java/openjdk/jdk-13/latest\n \n \n jdk\n \n JavaSE-14\n 14\n openjdk\n \n /opt/tools/java/openjdk/jdk-14/latest\n \n \n jdk\n \n JavaSE-15\n 15\n openjdk\n \n /opt/tools/java/openjdk/jdk-15/latest\n \n \n jdk\n \n JavaSE-16\n 16\n openjdk\n \n /opt/tools/java/openjdk/jdk-16/latest\n \n \n jdk\n \n JavaSE-17\n 17\n openjdk\n \n /opt/tools/java/openjdk/jdk-17/latest\n \n \n jdk\n \n JavaSE-18\n 18\n openjdk\n \n /opt/tools/java/openjdk/jdk-18/latest\n \n \n jdk\n \n JavaSE-19\n 19\n openjdk\n \n /opt/tools/java/openjdk/jdk-19/latest\n \n \n jdk\n \n JavaSE-20\n 20\n openjdk\n \n /opt/tools/java/openjdk/jdk-20/latest\n \n \n jdk\n \n JavaSE-21\n 21\n openjdk\n \n /opt/tools/java/openjdk/jdk-21/latest\n \n \n jdk\n \n JavaSE-22\n 22\n openjdk\n \n /opt/tools/java/openjdk/jdk-22/latest\n \n \n jdk\n \n JavaSE-23\n 23\n openjdk\n \n /opt/tools/java/openjdk/jdk-23/latest\n \n \n jdk\n \n JavaSE-24\n 24\n openjdk\n \n /opt/tools/java/openjdk/jdk-24/latest\n \n\n" }, "kind": "ConfigMap", "metadata": { diff --git a/instances/ee4j.wasp/target/k8s/statefulset.json b/instances/ee4j.wasp/target/k8s/statefulset.json index fb65f0f4b..8c89ec2c8 100644 --- a/instances/ee4j.wasp/target/k8s/statefulset.json +++ b/instances/ee4j.wasp/target/k8s/statefulset.json @@ -119,6 +119,12 @@ "cpu": "250m" } }, + "securityContext": { + "seLinuxOptions": { + "level": "s0:c56,c55", + "type": "spc_t" + } + }, "volumeMounts": [ { "mountPath": "/var/jenkins",