diff --git a/instances/foundation-internal.infra/jenkins/configuration.yml b/instances/foundation-internal.infra/jenkins/configuration.yml index 972cb5019..a81c747a1 100644 --- a/instances/foundation-internal.infra/jenkins/configuration.yml +++ b/instances/foundation-internal.infra/jenkins/configuration.yml @@ -82,13 +82,31 @@ unclassified: name: "gitlab.eclipse.org" readTimeout: 10 url: "https://gitlab.eclipse.org" + - apiTokenId: "gitlab-emo-api-token" + clientBuilderId: "autodetect" + connectionTimeout: 10 + ignoreCertificateErrors: false + name: "gitlab.eclipse.org emo" + readTimeout: 10 + url: "https://gitlab.eclipse.org" gitLabServers: servers: - credentialsId: "gitlab-personal-access-token" name: "gitlab.eclipse.org" serverUrl: "https://gitlab.eclipse.org" webhookSecretCredentialsId: "gitlab-webhook-secret" - + - credentialsId: "gitlab-emo-personal-access-token" + name: "gitlab.eclipse.org emo" + serverUrl: "https://gitlab.eclipse.org" + webhookSecretCredentialsId: "gitlab-emo-webhook-secret" + hashicorpVault: + configuration: + disableChildPoliciesOverride: false + engineVersion: 2 + timeout: 60 + vaultCredentialId: "secretsmanager-approle" + vaultUrl: "https://secretsmanager.eclipse.org" + tool: gradle: installations: diff --git a/instances/foundation-internal.infra/target/config.json b/instances/foundation-internal.infra/target/config.json index c7290400b..ec144c995 100644 --- a/instances/foundation-internal.infra/target/config.json +++ b/instances/foundation-internal.infra/target/config.json @@ -23,7 +23,7 @@ "docker.io/eclipsecbi/jiro-agent-basic:latest" ], "context": "basic", - "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-basic: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-basic: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", "image": "jiro-agent-basic", "registry": "docker.io", "repository": "eclipsecbi", @@ -120,7 +120,7 @@ "docker.io/eclipsecbi/jiro-agent-basic-ubuntu:latest" ], "context": "basic-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-basic-ubuntu: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", + "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-basic-ubuntu: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\nRUN ln -sf /bin/bash /bin/sh\n\nUSER 10001:0\n\n", "image": "jiro-agent-basic-ubuntu", "registry": "docker.io", "repository": "eclipsecbi", @@ -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\nRUN ln -sf /bin/bash /bin/sh\n\nUSER 10001:0\n\n", + "image": "jiro-agent-ubuntu-2204", + "registry": "docker.io", + "repository": "eclipsecbi", + "tag": "remoting-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\nRUN ln -sf /bin/bash /bin/sh\n\nUSER 10001:0\n\n", + "image": "jiro-agent-ubuntu-2404", + "registry": "docker.io", + "repository": "eclipsecbi", + "tag": "remoting-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" } } } diff --git a/instances/foundation-internal.infra/target/jenkins/configuration.yml b/instances/foundation-internal.infra/target/jenkins/configuration.yml index 4fc215204..9aa223f2c 100644 --- a/instances/foundation-internal.infra/target/jenkins/configuration.yml +++ b/instances/foundation-internal.infra/target/jenkins/configuration.yml @@ -476,6 +476,188 @@ jenkins: name: m2-dir inheritYamlMergeStrategy: "true" yamlMergeStrategy: "merge" + - name: "ubuntu-2204" + namespace: "foundation-internal-infra" + 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-infra" + 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: "foundation-internal-infra" + 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-infra" + 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" nodes: - permanent: labelString: "docker-build" @@ -627,12 +809,23 @@ unclassified: name: "gitlab.eclipse.org" readTimeout: 10 url: "https://gitlab.eclipse.org" + - apiTokenId: "gitlab-emo-api-token" + clientBuilderId: "autodetect" + connectionTimeout: 10 + ignoreCertificateErrors: false + name: "gitlab.eclipse.org emo" + readTimeout: 10 + url: "https://gitlab.eclipse.org" gitLabServers: servers: - credentialsId: "gitlab-personal-access-token" name: "gitlab.eclipse.org" serverUrl: "https://gitlab.eclipse.org" webhookSecretCredentialsId: "gitlab-webhook-secret" + - credentialsId: "gitlab-emo-personal-access-token" + name: "gitlab.eclipse.org emo" + serverUrl: "https://gitlab.eclipse.org" + webhookSecretCredentialsId: "gitlab-emo-webhook-secret" tool: jdk: installations: @@ -640,6 +833,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" @@ -769,6 +964,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/foundation-internal.infra/target/jenkins/plugins.log b/instances/foundation-internal.infra/target/jenkins/plugins.log index 7bc46a2ed..53977ee82 100644 --- a/instances/foundation-internal.infra/target/jenkins/plugins.log +++ b/instances/foundation-internal.infra/target/jenkins/plugins.log @@ -1,10 +1,10 @@ Resulting plugin list: -analysis-model-api 12.4.0 +analysis-model-api 12.6.0 ant 511.v0a_a_1a_334f41b_ antisamy-markup-formatter 162.v0e6ec0fcfcf6 apache-httpcomponents-client-4-api 4.5.14-208.v438351942757 -apache-httpcomponents-client-5-api 5.3.1-110.v77252fb_d4da_5 -asm-api 9.7-33.v4d23ef79fcc8 +apache-httpcomponents-client-5-api 5.4-118.v199115451c4d +asm-api 9.7.1-95.v9f552033802a_ authentication-tokens 1.119.v50285141b_7e1 authorize-project 1.7.2 bootstrap5-api 5.3.3-1 @@ -12,44 +12,44 @@ bouncycastle-api 2.30.1.78.1-248.ve27176eb_46cb_ branch-api 2.1178.v969d9eb_c728e build-timeout 1.33 caffeine-api 3.1.8-133.v17b_1ff2e0599 -checks-api 2.2.0 +checks-api 2.2.1 cloudbees-disk-usage-simple 203.v3f46a_7462b_1a_ cloudbees-folder 6.928.v7c780211d66e command-launcher 115.vd8b_301cc15d0 -commons-lang3-api 3.14.0-76.vda_5591261cfe +commons-lang3-api 3.17.0-84.vb_b_938040b_078 commons-text-api 1.12.0-129.v99a_50df237f7 -config-file-provider 973.vb_a_80ecb_9a_4d0 -configuration-as-code 1836.vccda_4a_122a_a_e -credentials 1371.vfee6b_095f0a_3 +config-file-provider 978.v8e85886ffdc4 +configuration-as-code 1850.va_a_8c31d3158b_ +credentials 1380.va_435002fa_924 credentials-binding 681.vf91669a_32e45 -data-tables-api 2.0.8-1 +data-tables-api 2.1.6-1 display-url-api 2.204.vf6fddd8a_8b_e9 docker-commons 443.v921729d5611d docker-workflow 580.vc0c340686b_54 -durable-task 568.v8fb_5c57e8417 -echarts-api 5.5.0-1 +durable-task 577.v2a_8a_4b_7c0247 +echarts-api 5.5.1-1 eddsa-api 0.3.0-4.v84c6f0f4969e -email-ext 1814.v404722f34263 +email-ext 1844.v3ea_a_b_842374a_ extended-read-permission 53.v6499940139e5 external-monitor-job 215.v2e88e894db_f8 extra-columns 1.26 -font-awesome-api 6.5.2-1 -forensics-api 2.4.0 +font-awesome-api 6.6.0-2 +forensics-api 2.6.0 ghprb 1.42.2 -git 5.3.0 +git 5.5.2 git-client 5.0.0 git-parameter 0.9.19 -github 1.39.0 +github 1.40.0 github-api 1.321-468.v6a_9f5f2d5a_7e -github-branch-source 1793.v1831e9c68d77 +github-branch-source 1797.v86fdb_4d57d43 gitlab-api 5.6.0-97.v6603a_83f8690 -gitlab-branch-source 704.vc7f1202d7e14 +gitlab-branch-source 710.v6f19df32544b_ gitlab-plugin 1.8.1 -gradle 2.12 +gradle 2.13 gson-api 2.11.0-41.v019fcf6125dc handy-uri-templates-2-api 2.1.8-30.v7e777411b_148 -hashicorp-vault-plugin 368.v48134f694db_f -instance-identity 185.v303dc7c645f9 +hashicorp-vault-plugin 370.v946b_53544a_30 +instance-identity 201.vd2a_b_5a_468a_a_6 ionicons-api 74.v93d5eb_813d5f jackson2-api 2.17.0-379.v02de8ec9f64c jakarta-activation-api 2.1.3-1 @@ -60,56 +60,56 @@ jaxb 2.3.9-1 jdk-tool 80.v8a_dee33ed6f0 jersey2-api 2.44-151.v6df377fff741 jjwt-api 0.11.5-112.ve82dfb_224b_a_d -jobConfigHistory 1229.v3039470161a_d -joda-time-api 2.12.7-29.v5a_b_e3a_82269a_ +jobConfigHistory 1268.v75ce751da_911 +joda-time-api 2.13.0-85.vb_64d1c2921f1 jquery3-api 3.7.1-2 jsch 0.2.16-86.v42e010d9484b_ json-api 20240303-41.v94e11e6de726 json-path-api 2.9.0-58.v62e3e85b_a_655 -junit 1284.vf75d778f98c5 -kubernetes 4280.vd919fa_528c7e +junit 1303.v05e2505656b_7 +kubernetes 4290.v93ea_4b_b_26a_61 kubernetes-cli 1.12.1 kubernetes-client-api 6.10.0-240.v57880ce8b_0b_2 -kubernetes-credentials 174.va_36e093562d9 +kubernetes-credentials 190.v03c305394deb_ ldap 725.v3cb_b_711b_1a_ef mail-watcher-plugin 1.19 -mailer 472.vf7c289a_4b_420 +mailer 488.v0c9639c1a_eb_3 matrix-auth 3.2.2 -matrix-project 832.va_66e270d2946 +matrix-project 838.v4d7b_7b_f9b_d4b_ maven-plugin 3.23 metrics 4.2.21-451.vd51df8df52ec -mina-sshd-api-common 2.13.1-117.v2f1a_b_66ff91d -mina-sshd-api-core 2.13.1-117.v2f1a_b_66ff91d +mina-sshd-api-common 2.14.0-133.vcc091215a_358 +mina-sshd-api-core 2.14.0-133.vcc091215a_358 okhttp-api 4.11.0-172.vda_da_1feeb_c6e pam-auth 1.11 parameterized-trigger 806.vf6fff3e28c3e pipeline-build-step 540.vb_e8849e1a_b_d8 pipeline-github 2.8-159.09e4403bc62f pipeline-graph-analysis 216.vfd8b_ece330ca_ -pipeline-groovy-lib 727.ve832a_9244dfa_ +pipeline-groovy-lib 730.ve57b_34648c63 pipeline-input-step 495.ve9c153f6067b_ -pipeline-maven 1421.v610fa_b_e2d60e -pipeline-maven-api 1421.v610fa_b_e2d60e +pipeline-maven 1457.vf7a_de13b_c0d4 +pipeline-maven-api 1457.vf7a_de13b_c0d4 pipeline-milestone-step 119.vdfdc43fc3b_9a_ -pipeline-model-api 2.2205.vc9522a_9d5711 -pipeline-model-definition 2.2205.vc9522a_9d5711 -pipeline-model-extensions 2.2205.vc9522a_9d5711 +pipeline-model-api 2.2214.vb_b_34b_2ea_9b_83 +pipeline-model-definition 2.2214.vb_b_34b_2ea_9b_83 +pipeline-model-extensions 2.2214.vb_b_34b_2ea_9b_83 pipeline-rest-api 2.34 pipeline-stage-step 312.v8cd10304c27a_ -pipeline-stage-tags-metadata 2.2205.vc9522a_9d5711 +pipeline-stage-tags-metadata 2.2214.vb_b_34b_2ea_9b_83 pipeline-stage-view 2.34 plain-credentials 183.va_de8f1dd5a_2b_ plugin-util-api 4.1.0 -prism-api 1.29.0-15 -prometheus 780.v7c50a_d288424 -promoted-builds 957.vf5b_cee587563 +prism-api 1.29.0-17 +prometheus 787.v52e8f47488fc +promoted-builds 965.vcda_c6a_e0998f rebuild 332.va_1ee476d8f6d -resource-disposer 0.23 +resource-disposer 0.24 scm-api 696.v778d637b_a_762 -script-security 1341.va_2819b_414686 -simple-theme-plugin 191.vcd207ef9dd24 -slack 734.v7f9ec8b_66975 -snakeyaml-api 2.2-121.v5a_68b_9300b_d4 +script-security 1362.v67dc1f0e1b_b_3 +simple-theme-plugin 196.v96d9592f4efa_ +slack 741.v00f9591c586d +snakeyaml-api 2.3-123.v13484c65210a_ sonar 2.17.2 ssh-agent 376.v8933585c69d3 ssh-credentials 343.v884f71d78167 @@ -119,17 +119,17 @@ timestamper 1.27 token-macro 400.v35420b_922dcb_ trilead-api 2.147.vb_73cc728a_32e variant 60.v7290fc0eb_b_cd -warnings-ng 11.4.0 +warnings-ng 11.7.0 workflow-aggregator 600.vb_57cdd26fdd7 -workflow-api 1322.v857eeeea_9902 +workflow-api 1336.vee415d95c521 workflow-basic-steps 1058.vcb_fc1e3a_21a_9 -workflow-cps 3922.va_f73b_7c4246b_ -workflow-durable-task-step 1364.v2fd76fb_6fd41 +workflow-cps 3969.vdc9d3a_efcc6a_ +workflow-durable-task-step 1371.vb_7cec8f3b_95e workflow-job 1400.v7fd111b_ec82f workflow-multibranch 783.787.v50539468395f workflow-scm-step 427.v4ca_6512e7df1 workflow-step-api 678.v3ee58b_469476 -workflow-support 920.v59f71ce16f04 +workflow-support 926.v9f4f9b_b_98c19 ws-cleanup 0.46 xvnc 1.28 diff --git a/instances/foundation-internal.infra/target/k8s/configmap-jenkins-config.yml b/instances/foundation-internal.infra/target/k8s/configmap-jenkins-config.yml index 33b460e90..060ea54a6 100644 --- a/instances/foundation-internal.infra/target/k8s/configmap-jenkins-config.yml +++ b/instances/foundation-internal.infra/target/k8s/configmap-jenkins-config.yml @@ -499,6 +499,188 @@ data: name: m2-dir inheritYamlMergeStrategy: "true" yamlMergeStrategy: "merge" + - name: "ubuntu-2204" + namespace: "foundation-internal-infra" + 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-infra" + 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: "foundation-internal-infra" + 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-infra" + 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" nodes: - permanent: labelString: "docker-build" @@ -650,12 +832,23 @@ data: name: "gitlab.eclipse.org" readTimeout: 10 url: "https://gitlab.eclipse.org" + - apiTokenId: "gitlab-emo-api-token" + clientBuilderId: "autodetect" + connectionTimeout: 10 + ignoreCertificateErrors: false + name: "gitlab.eclipse.org emo" + readTimeout: 10 + url: "https://gitlab.eclipse.org" gitLabServers: servers: - credentialsId: "gitlab-personal-access-token" name: "gitlab.eclipse.org" serverUrl: "https://gitlab.eclipse.org" webhookSecretCredentialsId: "gitlab-webhook-secret" + - credentialsId: "gitlab-emo-personal-access-token" + name: "gitlab.eclipse.org emo" + serverUrl: "https://gitlab.eclipse.org" + webhookSecretCredentialsId: "gitlab-emo-webhook-secret" tool: jdk: installations: @@ -663,6 +856,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" @@ -792,6 +987,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/foundation-internal.infra/target/k8s/m2-dir.json b/instances/foundation-internal.infra/target/k8s/m2-dir.json index 180fac9b7..d21143943 100644 --- a/instances/foundation-internal.infra/target/k8s/m2-dir.json +++ b/instances/foundation-internal.infra/target/k8s/m2-dir.json @@ -2,7 +2,7 @@ "apiVersion": "v1", "data": { ".mavenrc": "set -- -V -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/foundation-internal.infra/target/k8s/statefulset.json b/instances/foundation-internal.infra/target/k8s/statefulset.json index f114859d7..4f3b07699 100644 --- a/instances/foundation-internal.infra/target/k8s/statefulset.json +++ b/instances/foundation-internal.infra/target/k8s/statefulset.json @@ -119,6 +119,7 @@ "cpu": "1000m" } }, + "securityContext": { }, "volumeMounts": [ { "mountPath": "/var/jenkins",