diff --git a/instances/modeling.mdt.papyrus/jenkins/configuration.yml b/instances/modeling.mdt.papyrus/jenkins/configuration.yml index 7a030a3f2..89340b5d0 100644 --- a/instances/modeling.mdt.papyrus/jenkins/configuration.yml +++ b/instances/modeling.mdt.papyrus/jenkins/configuration.yml @@ -13,7 +13,28 @@ unclassified: - credentialsId: "gitlab-personal-access-token" name: "gitlab.eclipse.org" serverUrl: "https://gitlab.eclipse.org" - + globalLibraries: + libraries: + - name: "releng-pipeline" + defaultVersion: "main" + retriever: + modernSCM: + scm: + gitlab: + credentialsId: "gitlab-bot-ssh" + id: "611f7518-2540-47d8-8f31-a011fd6f9c15" + projectOwner: "eclipsefdn/it/releng/jenkins-pipeline-service" + projectPath: "eclipsefdn/it/releng/jenkins-pipeline-service/jenkins-pipeline-library" + serverName: "gitlab.eclipse.org" + traits: + - gitLabBranchDiscovery: + strategyId: 1 + - gitLabOriginDiscovery: + strategyId: 2 + - gitLabForkDiscovery: + buildMRForksNotMirror: false + strategyId: 2 + trust: "gitLabTrustPermissions" tool: nodejs: installations: diff --git a/instances/modeling.mdt.papyrus/target/Dockerfile b/instances/modeling.mdt.papyrus/target/Dockerfile index ae5857e83..6ac7efccc 100644 --- a/instances/modeling.mdt.papyrus/target/Dockerfile +++ b/instances/modeling.mdt.papyrus/target/Dockerfile @@ -1,4 +1,4 @@ -FROM docker.io/eclipsecbi/jiro-master:2.479.2 +FROM docker.io/eclipsecbi/jiro-master:2.462.3 EXPOSE 8080 EXPOSE 50000 diff --git a/instances/modeling.mdt.papyrus/target/config.json b/instances/modeling.mdt.papyrus/target/config.json index a40e94ed7..4df2bd753 100644 --- a/instances/modeling.mdt.papyrus/target/config.json +++ b/instances/modeling.mdt.papyrus/target/config.json @@ -19,13 +19,15 @@ "basic": { "agentWorkdir": "/home/jenkins/jenkins-agent", "docker": { - "aliases": [ ], + "aliases": [ + "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-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/3261.v9c670a_4748a_9/remoting-3261.v9c670a_4748a_9.jar\" \"/usr/share/jenkins/agent.jar\"\nADD \"https://github.com/jenkinsci/docker-agent/raw/3261.v9c670a_4748a_9-8/jenkins-agent\" \"/usr/local/bin/jenkins-agent\"\n\nRUN sed -e 's/JAVA_OPTS/JAVA_OPTS \\$JENKINS_REMOTING_JAVA_OPTS/g' /usr/local/bin/jenkins-agent > /usr/local/bin/jenkins-agent.sed \\\n && mv /usr/local/bin/jenkins-agent.sed /usr/local/bin/jenkins-agent\n\nRUN chmod 755 \"$(dirname \"/usr/share/jenkins/agent.jar\")\" \\\n && chmod 644 \"/usr/share/jenkins/agent.jar\" \\\n && chmod ug+rx \"/usr/local/bin/jenkins-agent\" \\\n && chgrp 0 \"/usr/local/bin/jenkins-agent\"\n\nRUN ln -sf /bin/bash /bin/sh\n\nUSER 10001:0\n\n", - "image": "jiro-agent-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: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/3248.3250.v3277a_8e88c9b_/remoting-3248.3250.v3277a_8e88c9b_.jar\" \"/usr/share/jenkins/agent.jar\" \nADD \"https://github.com/jenkinsci/docker-agent/raw/3248.3250.v3277a_8e88c9b_-1/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", - "tag": "remoting-3261.v9c670a_4748a_9" + "tag": "remoting-3248.3250.v3277a_8e88c9b_" }, "env": { "JAVA_TOOL_OPTIONS": [ ], @@ -93,8 +95,7 @@ "yamlMergeStrategy": "merge" }, "labels": [ - "basic", - "basic-ubuntu" + "basic" ], "maxHeap": "256m", "mode": "NORMAL", @@ -103,11 +104,305 @@ "jar": "/usr/share/jenkins/agent.jar", "startupScript": { "name": "jenkins-agent", - "url": "https://github.com/jenkinsci/docker-agent/raw/3261.v9c670a_4748a_9-8/jenkins-agent", - "version": "3261.v9c670a_4748a_9-8" + "url": "https://github.com/jenkinsci/docker-agent/raw/3248.3250.v3277a_8e88c9b_-1/jenkins-agent", + "version": "3248.3250.v3277a_8e88c9b_-1" + }, + "url": "https://repo.jenkins-ci.org/public/org/jenkins-ci/main/remoting/3248.3250.v3277a_8e88c9b_/remoting-3248.3250.v3277a_8e88c9b_.jar", + "version": "3248.3250.v3277a_8e88c9b_" + }, + "startupScript": "/usr/local/bin/jenkins-agent", + "username": "jenkins" + }, + "basic-ubuntu": { + "agentWorkdir": "/home/jenkins/jenkins-agent", + "docker": { + "aliases": [ + "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/3248.3250.v3277a_8e88c9b_/remoting-3248.3250.v3277a_8e88c9b_.jar\" \"/usr/share/jenkins/agent.jar\"\nADD \"https://github.com/jenkinsci/docker-agent/raw/3248.3250.v3277a_8e88c9b_-1/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", + "tag": "remoting-3248.3250.v3277a_8e88c9b_" + }, + "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": [ + "basic-ubuntu" + ], + "maxHeap": "256m", + "mode": "EXCLUSIVE", + "name": "basic-ubuntu", + "remoting": { + "jar": "/usr/share/jenkins/agent.jar", + "startupScript": { + "name": "jenkins-agent", + "url": "https://github.com/jenkinsci/docker-agent/raw/3248.3250.v3277a_8e88c9b_-1/jenkins-agent", + "version": "3248.3250.v3277a_8e88c9b_-1" + }, + "url": "https://repo.jenkins-ci.org/public/org/jenkins-ci/main/remoting/3248.3250.v3277a_8e88c9b_/remoting-3248.3250.v3277a_8e88c9b_.jar", + "version": "3248.3250.v3277a_8e88c9b_" + }, + "startupScript": "/usr/local/bin/jenkins-agent", + "username": "jenkins" + }, + "centos-7": { + "agentWorkdir": "/home/jenkins/jenkins-agent", + "docker": { + "aliases": [ + "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 [ \"/usr/local/bin/jenkins-agent\" ]\n\nADD \"https://repo.jenkins-ci.org/public/org/jenkins-ci/main/remoting/3248.3250.v3277a_8e88c9b_/remoting-3248.3250.v3277a_8e88c9b_.jar\" \"/usr/share/jenkins/agent.jar\"\nADD \"https://github.com/jenkinsci/docker-agent/raw/3248.3250.v3277a_8e88c9b_-1/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", + "tag": "remoting-3248.3250.v3277a_8e88c9b_" + }, + "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": [ + "migration", + "jipp-migration", + "centos-7" + ], + "maxHeap": "256m", + "mode": "EXCLUSIVE", + "name": "centos-7", + "remoting": { + "jar": "/usr/share/jenkins/agent.jar", + "startupScript": { + "name": "jenkins-agent", + "url": "https://github.com/jenkinsci/docker-agent/raw/3248.3250.v3277a_8e88c9b_-1/jenkins-agent", + "version": "3248.3250.v3277a_8e88c9b_-1" + }, + "url": "https://repo.jenkins-ci.org/public/org/jenkins-ci/main/remoting/3248.3250.v3277a_8e88c9b_/remoting-3248.3250.v3277a_8e88c9b_.jar", + "version": "3248.3250.v3277a_8e88c9b_" + }, + "startupScript": "/usr/local/bin/jenkins-agent", + "username": "jenkins" + }, + "centos-8": { + "agentWorkdir": "/home/jenkins/jenkins-agent", + "docker": { + "aliases": [ + "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 [ \"/usr/local/bin/jenkins-agent\" ]\n\nADD \"https://repo.jenkins-ci.org/public/org/jenkins-ci/main/remoting/3248.3250.v3277a_8e88c9b_/remoting-3248.3250.v3277a_8e88c9b_.jar\" \"/usr/share/jenkins/agent.jar\"\nADD \"https://github.com/jenkinsci/docker-agent/raw/3248.3250.v3277a_8e88c9b_-1/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", + "tag": "remoting-3248.3250.v3277a_8e88c9b_" + }, + "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": [ + "centos-latest", + "centos-8" + ], + "maxHeap": "256m", + "mode": "EXCLUSIVE", + "name": "centos-8", + "remoting": { + "jar": "/usr/share/jenkins/agent.jar", + "startupScript": { + "name": "jenkins-agent", + "url": "https://github.com/jenkinsci/docker-agent/raw/3248.3250.v3277a_8e88c9b_-1/jenkins-agent", + "version": "3248.3250.v3277a_8e88c9b_-1" }, - "url": "https://repo.jenkins-ci.org/public/org/jenkins-ci/main/remoting/3261.v9c670a_4748a_9/remoting-3261.v9c670a_4748a_9.jar", - "version": "3261.v9c670a_4748a_9" + "url": "https://repo.jenkins-ci.org/public/org/jenkins-ci/main/remoting/3248.3250.v3277a_8e88c9b_/remoting-3248.3250.v3277a_8e88c9b_.jar", + "version": "3248.3250.v3277a_8e88c9b_" }, "startupScript": "/usr/local/bin/jenkins-agent", "username": "jenkins" @@ -115,14 +410,16 @@ "ubuntu-2204": { "agentWorkdir": "/home/jenkins/jenkins-agent", "docker": { - "aliases": [ ], + "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/3261.v9c670a_4748a_9/remoting-3261.v9c670a_4748a_9.jar\" \"/usr/share/jenkins/agent.jar\"\nADD \"https://github.com/jenkinsci/docker-agent/raw/3261.v9c670a_4748a_9-8/jenkins-agent\" \"/usr/local/bin/jenkins-agent\"\n\nRUN sed -e 's/JAVA_OPTS/JAVA_OPTS \\$JENKINS_REMOTING_JAVA_OPTS/g' /usr/local/bin/jenkins-agent > /usr/local/bin/jenkins-agent.sed \\\n && mv /usr/local/bin/jenkins-agent.sed /usr/local/bin/jenkins-agent\n\nRUN chmod 755 \"$(dirname \"/usr/share/jenkins/agent.jar\")\" \\\n && chmod 644 \"/usr/share/jenkins/agent.jar\" \\\n && chmod ug+rx \"/usr/local/bin/jenkins-agent\" \\\n && chgrp 0 \"/usr/local/bin/jenkins-agent\"\n\nRUN ln -sf /bin/bash /bin/sh\n\nUSER 10001:0\n\n", + "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/3248.3250.v3277a_8e88c9b_/remoting-3248.3250.v3277a_8e88c9b_.jar\" \"/usr/share/jenkins/agent.jar\"\nADD \"https://github.com/jenkinsci/docker-agent/raw/3248.3250.v3277a_8e88c9b_-1/jenkins-agent\" \"/usr/local/bin/jenkins-agent\"\n\nRUN sed -e 's/JAVA_OPTS/JAVA_OPTS \\$JENKINS_REMOTING_JAVA_OPTS/g' /usr/local/bin/jenkins-agent > /usr/local/bin/jenkins-agent.sed \\\n && mv /usr/local/bin/jenkins-agent.sed /usr/local/bin/jenkins-agent\n\nRUN chmod 755 \"$(dirname \"/usr/share/jenkins/agent.jar\")\" \\\n && chmod 644 \"/usr/share/jenkins/agent.jar\" \\\n && chmod ug+rx \"/usr/local/bin/jenkins-agent\" \\\n && chgrp 0 \"/usr/local/bin/jenkins-agent\"\n\nRUN ln -sf /bin/bash /bin/sh\n\nUSER 10001:0\n\n", "image": "jiro-agent-ubuntu-2204", "registry": "docker.io", "repository": "eclipsecbi", - "tag": "remoting-3261.v9c670a_4748a_9" + "tag": "remoting-3248.3250.v3277a_8e88c9b_" }, "env": { "JAVA_TOOL_OPTIONS": [ ], @@ -199,11 +496,11 @@ "jar": "/usr/share/jenkins/agent.jar", "startupScript": { "name": "jenkins-agent", - "url": "https://github.com/jenkinsci/docker-agent/raw/3261.v9c670a_4748a_9-8/jenkins-agent", - "version": "3261.v9c670a_4748a_9-8" + "url": "https://github.com/jenkinsci/docker-agent/raw/3248.3250.v3277a_8e88c9b_-1/jenkins-agent", + "version": "3248.3250.v3277a_8e88c9b_-1" }, - "url": "https://repo.jenkins-ci.org/public/org/jenkins-ci/main/remoting/3261.v9c670a_4748a_9/remoting-3261.v9c670a_4748a_9.jar", - "version": "3261.v9c670a_4748a_9" + "url": "https://repo.jenkins-ci.org/public/org/jenkins-ci/main/remoting/3248.3250.v3277a_8e88c9b_/remoting-3248.3250.v3277a_8e88c9b_.jar", + "version": "3248.3250.v3277a_8e88c9b_" }, "startupScript": "/usr/local/bin/jenkins-agent", "username": "jenkins" @@ -211,14 +508,16 @@ "ubuntu-2404": { "agentWorkdir": "/home/jenkins/jenkins-agent", "docker": { - "aliases": [ ], + "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/3261.v9c670a_4748a_9/remoting-3261.v9c670a_4748a_9.jar\" \"/usr/share/jenkins/agent.jar\"\nADD \"https://github.com/jenkinsci/docker-agent/raw/3261.v9c670a_4748a_9-8/jenkins-agent\" \"/usr/local/bin/jenkins-agent\"\n\nRUN sed -e 's/JAVA_OPTS/JAVA_OPTS \\$JENKINS_REMOTING_JAVA_OPTS/g' /usr/local/bin/jenkins-agent > /usr/local/bin/jenkins-agent.sed \\\n && mv /usr/local/bin/jenkins-agent.sed /usr/local/bin/jenkins-agent\n\nRUN chmod 755 \"$(dirname \"/usr/share/jenkins/agent.jar\")\" \\\n && chmod 644 \"/usr/share/jenkins/agent.jar\" \\\n && chmod ug+rx \"/usr/local/bin/jenkins-agent\" \\\n && chgrp 0 \"/usr/local/bin/jenkins-agent\"\n\nRUN ln -sf /bin/bash /bin/sh\n\nUSER 10001:0\n\n", + "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/3248.3250.v3277a_8e88c9b_/remoting-3248.3250.v3277a_8e88c9b_.jar\" \"/usr/share/jenkins/agent.jar\"\nADD \"https://github.com/jenkinsci/docker-agent/raw/3248.3250.v3277a_8e88c9b_-1/jenkins-agent\" \"/usr/local/bin/jenkins-agent\"\n\nRUN sed -e 's/JAVA_OPTS/JAVA_OPTS \\$JENKINS_REMOTING_JAVA_OPTS/g' /usr/local/bin/jenkins-agent > /usr/local/bin/jenkins-agent.sed \\\n && mv /usr/local/bin/jenkins-agent.sed /usr/local/bin/jenkins-agent\n\nRUN chmod 755 \"$(dirname \"/usr/share/jenkins/agent.jar\")\" \\\n && chmod 644 \"/usr/share/jenkins/agent.jar\" \\\n && chmod ug+rx \"/usr/local/bin/jenkins-agent\" \\\n && chgrp 0 \"/usr/local/bin/jenkins-agent\"\n\nRUN ln -sf /bin/bash /bin/sh\n\nUSER 10001:0\n\n", "image": "jiro-agent-ubuntu-2404", "registry": "docker.io", "repository": "eclipsecbi", - "tag": "remoting-3261.v9c670a_4748a_9" + "tag": "remoting-3248.3250.v3277a_8e88c9b_" }, "env": { "JAVA_TOOL_OPTIONS": [ ], @@ -287,12 +586,7 @@ }, "labels": [ "ubuntu-latest", - "ubuntu-2404", - "migration", - "jipp-migration", - "centos-7", - "centos-8", - "centos-latest" + "ubuntu-2404" ], "maxHeap": "256m", "mode": "EXCLUSIVE", @@ -301,11 +595,11 @@ "jar": "/usr/share/jenkins/agent.jar", "startupScript": { "name": "jenkins-agent", - "url": "https://github.com/jenkinsci/docker-agent/raw/3261.v9c670a_4748a_9-8/jenkins-agent", - "version": "3261.v9c670a_4748a_9-8" + "url": "https://github.com/jenkinsci/docker-agent/raw/3248.3250.v3277a_8e88c9b_-1/jenkins-agent", + "version": "3248.3250.v3277a_8e88c9b_-1" }, - "url": "https://repo.jenkins-ci.org/public/org/jenkins-ci/main/remoting/3261.v9c670a_4748a_9/remoting-3261.v9c670a_4748a_9.jar", - "version": "3261.v9c670a_4748a_9" + "url": "https://repo.jenkins-ci.org/public/org/jenkins-ci/main/remoting/3248.3250.v3277a_8e88c9b_/remoting-3248.3250.v3277a_8e88c9b_.jar", + "version": "3248.3250.v3277a_8e88c9b_" }, "startupScript": "/usr/local/bin/jenkins-agent", "username": "jenkins" @@ -313,14 +607,16 @@ "ubuntu-2404-agent-6gb": { "agentWorkdir": "/home/jenkins/jenkins-agent", "docker": { - "aliases": [ ], + "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/3261.v9c670a_4748a_9/remoting-3261.v9c670a_4748a_9.jar\" \"/usr/share/jenkins/agent.jar\"\nADD \"https://github.com/jenkinsci/docker-agent/raw/3261.v9c670a_4748a_9-8/jenkins-agent\" \"/usr/local/bin/jenkins-agent\"\n\nRUN sed -e 's/JAVA_OPTS/JAVA_OPTS \\$JENKINS_REMOTING_JAVA_OPTS/g' /usr/local/bin/jenkins-agent > /usr/local/bin/jenkins-agent.sed \\\n && mv /usr/local/bin/jenkins-agent.sed /usr/local/bin/jenkins-agent\n\nRUN chmod 755 \"$(dirname \"/usr/share/jenkins/agent.jar\")\" \\\n && chmod 644 \"/usr/share/jenkins/agent.jar\" \\\n && chmod ug+rx \"/usr/local/bin/jenkins-agent\" \\\n && chgrp 0 \"/usr/local/bin/jenkins-agent\"\n\nRUN ln -sf /bin/bash /bin/sh\n\nUSER 10001:0\n\n", + "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/3248.3250.v3277a_8e88c9b_/remoting-3248.3250.v3277a_8e88c9b_.jar\" \"/usr/share/jenkins/agent.jar\"\nADD \"https://github.com/jenkinsci/docker-agent/raw/3248.3250.v3277a_8e88c9b_-1/jenkins-agent\" \"/usr/local/bin/jenkins-agent\"\n\nRUN sed -e 's/JAVA_OPTS/JAVA_OPTS \\$JENKINS_REMOTING_JAVA_OPTS/g' /usr/local/bin/jenkins-agent > /usr/local/bin/jenkins-agent.sed \\\n && mv /usr/local/bin/jenkins-agent.sed /usr/local/bin/jenkins-agent\n\nRUN chmod 755 \"$(dirname \"/usr/share/jenkins/agent.jar\")\" \\\n && chmod 644 \"/usr/share/jenkins/agent.jar\" \\\n && chmod ug+rx \"/usr/local/bin/jenkins-agent\" \\\n && chgrp 0 \"/usr/local/bin/jenkins-agent\"\n\nRUN ln -sf /bin/bash /bin/sh\n\nUSER 10001:0\n\n", "image": "jiro-agent-ubuntu-2404", "registry": "docker.io", "repository": "eclipsecbi", - "tag": "remoting-3261.v9c670a_4748a_9" + "tag": "remoting-3248.3250.v3277a_8e88c9b_" }, "env": { "JAVA_TOOL_OPTIONS": [ ], @@ -397,11 +693,11 @@ "jar": "/usr/share/jenkins/agent.jar", "startupScript": { "name": "jenkins-agent", - "url": "https://github.com/jenkinsci/docker-agent/raw/3261.v9c670a_4748a_9-8/jenkins-agent", - "version": "3261.v9c670a_4748a_9-8" + "url": "https://github.com/jenkinsci/docker-agent/raw/3248.3250.v3277a_8e88c9b_-1/jenkins-agent", + "version": "3248.3250.v3277a_8e88c9b_-1" }, - "url": "https://repo.jenkins-ci.org/public/org/jenkins-ci/main/remoting/3261.v9c670a_4748a_9/remoting-3261.v9c670a_4748a_9.jar", - "version": "3261.v9c670a_4748a_9" + "url": "https://repo.jenkins-ci.org/public/org/jenkins-ci/main/remoting/3248.3250.v3277a_8e88c9b_/remoting-3248.3250.v3277a_8e88c9b_.jar", + "version": "3248.3250.v3277a_8e88c9b_" }, "startupScript": "/usr/local/bin/jenkins-agent", "username": "jenkins" @@ -420,11 +716,11 @@ }, "docker": { "master": { - "dockerfile": "FROM docker.io/eclipsecbi/jiro-master:2.479.2\n\nEXPOSE 8080\nEXPOSE 50000\n\nCOPY jenkins/ref/plugins /usr/share/jenkins/ref/plugins\n\nRUN mkdir -p /usr/share/jenkins/ref/userContent/theme/\nCOPY jenkins/quicksilver.css.override /usr/share/jenkins/ref/userContent/theme/\nCOPY jenkins/title.js /usr/share/jenkins/ref/userContent/theme/\n\nUSER 10001\n", + "dockerfile": "FROM docker.io/eclipsecbi/jiro-master:2.462.3\n\nEXPOSE 8080\nEXPOSE 50000\n\nCOPY jenkins/ref/plugins /usr/share/jenkins/ref/plugins\n\nRUN mkdir -p /usr/share/jenkins/ref/userContent/theme/\nCOPY jenkins/quicksilver.css.override /usr/share/jenkins/ref/userContent/theme/\nCOPY jenkins/title.js /usr/share/jenkins/ref/userContent/theme/\n\nUSER 10001\n", "image": "modeling.mdt.papyrus", "registry": "docker.io", "repository": "eclipsecbijenkins", - "tag": "2.479.2" + "tag": "2.462.3" } }, "gradle": { @@ -513,11 +809,11 @@ "image": "jiro-master", "registry": "docker.io", "repository": "eclipsecbi", - "tag": "2.479.2" + "tag": "2.462.3" }, "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 eclipsecbi/semeru-ubuntu-coreutils:openjdk17-jammy\n\n# These environment variables will be used in the uid_entrypoint script from the parent image\nENV USER_NAME=\"jenkins\"\nENV HOME=\"/var/jenkins\"\n\n# jenkins version being bundled in this docker image\nENV JENKINS_HOME=\"/var/jenkins\"\nENV JENKINS_WAR=\"/usr/share/jenkins/jenkins.war\"\nENV COPY_REFERENCE_FILE_LOG=\"/var/jenkins/copy_reference_file.log\"\nENV REF=\"/usr/share/jenkins/ref\"\n\nVOLUME [ \"/var/jenkins\", \"/var/cache/jenkins/war\", \"/var/cache/jenkins/plugins\" ]\nWORKDIR \"/var/jenkins\"\n\nENTRYPOINT [\"/usr/bin/dumb-init\", \"--\", \"/usr/local/bin/jenkins.sh\"]\n\nRUN mkdir -p $(dirname \"/usr/share/jenkins/jenkins.war\") && mkdir -p \"/usr/share/jenkins/ref\"\n\nCOPY scripts/* /usr/local/bin/\nRUN chmod ug+x /usr/local/bin/*\n\nCOPY war/jenkins.war \"/usr/share/jenkins/jenkins.war\"\nCOPY ref/ \"/usr/share/jenkins/ref/\"\n", "home": "/var/jenkins", - "id": "2.479.2", + "id": "2.462.3", "key_fingerprint": "5BA31D57EF5975CA", "plugin_manager": { "jar": "https://github.com/jenkinsci/plugin-installation-manager-tool/releases/download/2.13.0/jenkins-plugin-manager-2.13.0.jar", @@ -559,7 +855,6 @@ "parameterized-trigger", "pipeline-maven", "pipeline-stage-view", - "pipeline-graph-view", "prometheus", "promoted-builds", "rebuild", @@ -576,7 +871,7 @@ "pubkey": "-----BEGIN PGP PUBLIC KEY BLOCK-----\n\n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\nMetBbjkOnNXyWrP3SAPwqQMMg/vNa+mJIjoNByw=\n=sdsH\n-----END PGP PUBLIC KEY BLOCK-----\n", "ref": "/usr/share/jenkins/ref", "remoting": { - "version": "3261.v9c670a_4748a_9" + "version": "3248.3250.v3277a_8e88c9b_" }, "scripts": { "jenkins": "https://github.com/jenkinsci/docker/raw/master/jenkins.sh", @@ -584,9 +879,9 @@ }, "updateCenter": "https://updates.jenkins.io", "username": "jenkins", - "version": "2.479.2", + "version": "2.462.3", "war": "/usr/share/jenkins/jenkins.war", - "warBaseUrl": "https://repo.jenkins-ci.org/public/org/jenkins-ci/main/jenkins-war/2.479.2", + "warBaseUrl": "https://repo.jenkins-ci.org/public/org/jenkins-ci/main/jenkins-war/2.462.3", "webroot": "/var/cache/jenkins/war" }, "kubernetes": { diff --git a/instances/modeling.mdt.papyrus/target/jenkins/configuration.yml b/instances/modeling.mdt.papyrus/target/jenkins/configuration.yml index 68d8ea79b..eed25e880 100644 --- a/instances/modeling.mdt.papyrus/target/jenkins/configuration.yml +++ b/instances/modeling.mdt.papyrus/target/jenkins/configuration.yml @@ -73,16 +73,18 @@ jenkins: containerCapStr: "6" jenkinsUrl: "http://jenkins-ui.papyrus.svc.cluster.local/papyrus" jenkinsTunnel: "jenkins-discovery.papyrus.svc.cluster.local:50000" + garbageCollection: + timeout: 300 maxRequestsPerHostStr: "32" namespace: "papyrus" podRetention: "never" templates: - name: "basic" namespace: "papyrus" - label: "basic basic-ubuntu" + label: "basic" containers: - name: "jnlp" - image: docker.io/eclipsecbi/jiro-agent-basic-ubuntu:remoting-3261.v9c670a_4748a_9 + image: docker.io/eclipsecbi/jiro-agent-basic:remoting-3248.3250.v3277a_8e88c9b_ alwaysPullImage: true livenessProbe: failureThreshold: 0 @@ -168,12 +170,285 @@ jenkins: name: m2-dir inheritYamlMergeStrategy: "true" yamlMergeStrategy: "merge" + - name: "basic-ubuntu" + namespace: "papyrus" + label: "basic-ubuntu" + containers: + - name: "jnlp" + image: docker.io/eclipsecbi/jiro-agent-basic-ubuntu:remoting-3248.3250.v3277a_8e88c9b_ + 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-papyrus" + 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: "centos-7" + namespace: "papyrus" + label: "migration jipp-migration centos-7" + containers: + - name: "jnlp" + image: docker.io/eclipsecbi/jiro-agent-centos-7:remoting-3248.3250.v3277a_8e88c9b_ + 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-papyrus" + 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: "centos-8" + namespace: "papyrus" + label: "centos-latest centos-8" + containers: + - name: "jnlp" + image: docker.io/eclipsecbi/jiro-agent-centos-8:remoting-3248.3250.v3277a_8e88c9b_ + 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-papyrus" + 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-2204" namespace: "papyrus" label: "ubuntu-2204" containers: - name: "jnlp" - image: docker.io/eclipsecbi/jiro-agent-ubuntu-2204:remoting-3261.v9c670a_4748a_9 + image: docker.io/eclipsecbi/jiro-agent-ubuntu-2204:remoting-3248.3250.v3277a_8e88c9b_ alwaysPullImage: true livenessProbe: failureThreshold: 0 @@ -261,10 +536,10 @@ jenkins: yamlMergeStrategy: "merge" - name: "ubuntu-2404" namespace: "papyrus" - label: "ubuntu-latest ubuntu-2404 migration jipp-migration centos-7 centos-8 centos-latest" + label: "ubuntu-latest ubuntu-2404" containers: - name: "jnlp" - image: docker.io/eclipsecbi/jiro-agent-ubuntu-2404:remoting-3261.v9c670a_4748a_9 + image: docker.io/eclipsecbi/jiro-agent-ubuntu-2404:remoting-3248.3250.v3277a_8e88c9b_ alwaysPullImage: true livenessProbe: failureThreshold: 0 @@ -355,7 +630,7 @@ jenkins: label: "centos-7-6gb" containers: - name: "jnlp" - image: docker.io/eclipsecbi/jiro-agent-ubuntu-2404:remoting-3261.v9c670a_4748a_9 + image: docker.io/eclipsecbi/jiro-agent-ubuntu-2404:remoting-3248.3250.v3277a_8e88c9b_ alwaysPullImage: true livenessProbe: failureThreshold: 0 @@ -542,6 +817,28 @@ unclassified: - credentialsId: "gitlab-personal-access-token" name: "gitlab.eclipse.org" serverUrl: "https://gitlab.eclipse.org" + globalLibraries: + libraries: + - name: "releng-pipeline" + defaultVersion: "main" + retriever: + modernSCM: + scm: + gitlab: + credentialsId: "gitlab-bot-ssh" + id: "611f7518-2540-47d8-8f31-a011fd6f9c15" + projectOwner: "eclipsefdn/it/releng/jenkins-pipeline-service" + projectPath: "eclipsefdn/it/releng/jenkins-pipeline-service/jenkins-pipeline-library" + serverName: "gitlab.eclipse.org" + traits: + - gitLabBranchDiscovery: + strategyId: 1 + - gitLabOriginDiscovery: + strategyId: 2 + - gitLabForkDiscovery: + buildMRForksNotMirror: false + strategyId: 2 + trust: "gitLabTrustPermissions" tool: jdk: installations: diff --git a/instances/modeling.mdt.papyrus/target/jenkins/plugins.log b/instances/modeling.mdt.papyrus/target/jenkins/plugins.log index 3edab506a..2252bd5c8 100644 --- a/instances/modeling.mdt.papyrus/target/jenkins/plugins.log +++ b/instances/modeling.mdt.papyrus/target/jenkins/plugins.log @@ -14,36 +14,36 @@ build-timeout 1.33 caffeine-api 3.1.8-133.v17b_1ff2e0599 checks-api 2.2.1 cloudbees-disk-usage-simple 232.v713eeed2e1f4 -cloudbees-folder 6.959.v4ed5cc9e2dd4 +cloudbees-folder 6.955.v81e2a_35c08d3 command-launcher 116.vd85919c54a_d6 commons-lang3-api 3.17.0-84.vb_b_938040b_078 commons-text-api 1.12.0-129.v99a_50df237f7 config-file-provider 980.v88956a_a_5d6a_d -configuration-as-code 1897.v79281e066ea_7 -credentials 1389.vd7a_b_f5fa_50a_2 -credentials-binding 687.v619cb_15e923f +configuration-as-code 1873.vea_5814ca_9c93 +credentials 1384.vf0a_2ed06f9c6 +credentials-binding 681.vf91669a_32e45 dashboard-view 2.521.v339b_a_f4d8da_8 data-tables-api 2.1.8-1 -display-url-api 2.209.v582ed814ff2f -durable-task 581.v299a_5609d767 +display-url-api 2.204.vf6fddd8a_8b_e9 +durable-task 577.v2a_8a_4b_7c0247 echarts-api 5.5.1-4 eddsa-api 0.3.0-4.v84c6f0f4969e -email-ext 1861.vdb_d991590994 +email-ext 1849.v6dd03b_f6e423 extended-read-permission 53.v6499940139e5 external-monitor-job 215.v2e88e894db_f8 -extra-columns 1.27 +extra-columns 1.26 font-awesome-api 6.6.0-2 forensics-api 2.6.0 ghprb 1.42.2 -git 5.6.0 -git-client 6.1.0 +git 5.5.2 +git-client 5.0.0 git-parameter 0.10.0 github 1.40.0 -github-api 1.321-478.vc9ce627ce001 +github-api 1.321-468.v6a_9f5f2d5a_7e github-branch-source 1807.v50351eb_7dd13 gitlab-api 5.6.0-97.v6603a_83f8690 -gitlab-branch-source 715.v4c830b_ca_ef95 -gitlab-plugin 1.9.6 +gitlab-branch-source 714.v45a_1ef5eb_247 +gitlab-plugin 1.8.2 gson-api 2.11.0-85.v1f4e87273c33 handy-uri-templates-2-api 2.1.8-30.v7e777411b_148 hashicorp-vault-plugin 371.v884a_4dd60fb_6 @@ -64,29 +64,28 @@ jquery3-api 3.7.1-2 jsch 0.2.16-86.v42e010d9484b_ json-api 20240303-101.v7a_8666713110 json-path-api 2.9.0-118.v7f23ed82a_8b_8 -junit 1309.v0078b_fecd6ed +junit 1311.v39e1716e4eb_e kubernetes 4296.v20a_7e4d77cf6 kubernetes-client-api 6.10.0-240.v57880ce8b_0b_2 kubernetes-credentials 190.v03c305394deb_ -ldap 770.vb_455e934581a_ -mailer 489.vd4b_25144138f +ldap 725.v3cb_b_711b_1a_ef +mailer 488.v0c9639c1a_eb_3 matrix-auth 3.2.3 -matrix-project 840.v812f627cb_578 +matrix-project 839.vff91cd7e3a_b_2 maven-plugin 3.24 metrics 4.2.21-458.vcf496cb_839e4 mina-sshd-api-common 2.14.0-133.vcc091215a_358 mina-sshd-api-core 2.14.0-133.vcc091215a_358 nodejs 1.6.2 -okhttp-api 4.11.0-181.v1de5b_83857df +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-graph-analysis 216.vfd8b_ece330ca_ -pipeline-graph-view 382.vb_9a_27b_7b_ea_71 pipeline-groovy-lib 744.v5b_556ee7c253 pipeline-input-step 495.ve9c153f6067b_ -pipeline-maven 1469.ve15ca_a_b_90b_44 -pipeline-maven-api 1469.ve15ca_a_b_90b_44 +pipeline-maven 1457.vf7a_de13b_c0d4 +pipeline-maven-api 1457.vf7a_de13b_c0d4 pipeline-milestone-step 119.vdfdc43fc3b_9a_ pipeline-model-api 2.2218.v56d0cda_37c72 pipeline-model-definition 2.2218.v56d0cda_37c72 @@ -101,32 +100,32 @@ prism-api 1.29.0-18 prometheus 795.v995762102f28 promoted-builds 965.vcda_c6a_e0998f rebuild 332.va_1ee476d8f6d -resource-disposer 0.25 -scm-api 698.v8e3b_c788f0a_6 +resource-disposer 0.24 +scm-api 696.v778d637b_a_762 script-security 1369.v9b_98a_4e95b_2d simple-theme-plugin 196.v96d9592f4efa_ snakeyaml-api 2.3-123.v13484c65210a_ -sonar 2.17.3 +sonar 2.17.2 ssh-agent 376.v8933585c69d3 ssh-credentials 349.vb_8b_6b_9709f5b_ ssh-slaves 2.973.v0fa_8c0dea_f9f structs 338.v848422169819 -timestamper 1.28 +timestamper 1.27 token-macro 400.v35420b_922dcb_ trilead-api 2.147.vb_73cc728a_32e variant 60.v7290fc0eb_b_cd -warnings-ng 11.12.0 +warnings-ng 11.11.0 workflow-aggregator 600.vb_57cdd26fdd7 workflow-api 1336.vee415d95c521 workflow-basic-steps 1058.vcb_fc1e3a_21a_9 -workflow-cps 3996.va_f5c1799f978 -workflow-durable-task-step 1398.vf6c9e89e5988 -workflow-job 1468.vcf4f5ee92395 +workflow-cps 3993.v3e20a_37282f8 +workflow-durable-task-step 1378.v6a_3e903058a_3 +workflow-job 1436.vfa_244484591f workflow-multibranch 795.ve0cb_1f45ca_9a_ workflow-scm-step 427.v4ca_6512e7df1 workflow-step-api 678.v3ee58b_469476 workflow-support 936.v9fa_77211ca_e1 -ws-cleanup 0.48 +ws-cleanup 0.47 xvnc 1.28 zentimestamp 4.2 diff --git a/instances/modeling.mdt.papyrus/target/k8s/configmap-jenkins-config.yml b/instances/modeling.mdt.papyrus/target/k8s/configmap-jenkins-config.yml index 69c24a024..1749fa361 100644 --- a/instances/modeling.mdt.papyrus/target/k8s/configmap-jenkins-config.yml +++ b/instances/modeling.mdt.papyrus/target/k8s/configmap-jenkins-config.yml @@ -15,7 +15,7 @@ metadata: org.eclipse.cbi.jiro/kind: "master" annotations: org.eclipse.cbi.jiro/jenkins.version: "latest" - org.eclipse.cbi.jiro/jenkins.actualVersion: "2.479.2" + org.eclipse.cbi.jiro/jenkins.actualVersion: "2.462.3" org.eclipse.cbi.jiro/kubernetes.master.namespace: "papyrus" namespace: "papyrus" name: jenkins-config @@ -96,16 +96,18 @@ data: containerCapStr: "6" jenkinsUrl: "http://jenkins-ui.papyrus.svc.cluster.local/papyrus" jenkinsTunnel: "jenkins-discovery.papyrus.svc.cluster.local:50000" + garbageCollection: + timeout: 300 maxRequestsPerHostStr: "32" namespace: "papyrus" podRetention: "never" templates: - name: "basic" namespace: "papyrus" - label: "basic basic-ubuntu" + label: "basic" containers: - name: "jnlp" - image: docker.io/eclipsecbi/jiro-agent-basic-ubuntu:remoting-3261.v9c670a_4748a_9 + image: docker.io/eclipsecbi/jiro-agent-basic:remoting-3248.3250.v3277a_8e88c9b_ alwaysPullImage: true livenessProbe: failureThreshold: 0 @@ -191,12 +193,285 @@ data: name: m2-dir inheritYamlMergeStrategy: "true" yamlMergeStrategy: "merge" + - name: "basic-ubuntu" + namespace: "papyrus" + label: "basic-ubuntu" + containers: + - name: "jnlp" + image: docker.io/eclipsecbi/jiro-agent-basic-ubuntu:remoting-3248.3250.v3277a_8e88c9b_ + 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-papyrus" + 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: "centos-7" + namespace: "papyrus" + label: "migration jipp-migration centos-7" + containers: + - name: "jnlp" + image: docker.io/eclipsecbi/jiro-agent-centos-7:remoting-3248.3250.v3277a_8e88c9b_ + 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-papyrus" + 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: "centos-8" + namespace: "papyrus" + label: "centos-latest centos-8" + containers: + - name: "jnlp" + image: docker.io/eclipsecbi/jiro-agent-centos-8:remoting-3248.3250.v3277a_8e88c9b_ + 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-papyrus" + 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-2204" namespace: "papyrus" label: "ubuntu-2204" containers: - name: "jnlp" - image: docker.io/eclipsecbi/jiro-agent-ubuntu-2204:remoting-3261.v9c670a_4748a_9 + image: docker.io/eclipsecbi/jiro-agent-ubuntu-2204:remoting-3248.3250.v3277a_8e88c9b_ alwaysPullImage: true livenessProbe: failureThreshold: 0 @@ -284,10 +559,10 @@ data: yamlMergeStrategy: "merge" - name: "ubuntu-2404" namespace: "papyrus" - label: "ubuntu-latest ubuntu-2404 migration jipp-migration centos-7 centos-8 centos-latest" + label: "ubuntu-latest ubuntu-2404" containers: - name: "jnlp" - image: docker.io/eclipsecbi/jiro-agent-ubuntu-2404:remoting-3261.v9c670a_4748a_9 + image: docker.io/eclipsecbi/jiro-agent-ubuntu-2404:remoting-3248.3250.v3277a_8e88c9b_ alwaysPullImage: true livenessProbe: failureThreshold: 0 @@ -378,7 +653,7 @@ data: label: "centos-7-6gb" containers: - name: "jnlp" - image: docker.io/eclipsecbi/jiro-agent-ubuntu-2404:remoting-3261.v9c670a_4748a_9 + image: docker.io/eclipsecbi/jiro-agent-ubuntu-2404:remoting-3248.3250.v3277a_8e88c9b_ alwaysPullImage: true livenessProbe: failureThreshold: 0 @@ -565,6 +840,28 @@ data: - credentialsId: "gitlab-personal-access-token" name: "gitlab.eclipse.org" serverUrl: "https://gitlab.eclipse.org" + globalLibraries: + libraries: + - name: "releng-pipeline" + defaultVersion: "main" + retriever: + modernSCM: + scm: + gitlab: + credentialsId: "gitlab-bot-ssh" + id: "611f7518-2540-47d8-8f31-a011fd6f9c15" + projectOwner: "eclipsefdn/it/releng/jenkins-pipeline-service" + projectPath: "eclipsefdn/it/releng/jenkins-pipeline-service/jenkins-pipeline-library" + serverName: "gitlab.eclipse.org" + traits: + - gitLabBranchDiscovery: + strategyId: 1 + - gitLabOriginDiscovery: + strategyId: 2 + - gitLabForkDiscovery: + buildMRForksNotMirror: false + strategyId: 2 + trust: "gitLabTrustPermissions" tool: jdk: installations: diff --git a/instances/modeling.mdt.papyrus/target/k8s/statefulset.json b/instances/modeling.mdt.papyrus/target/k8s/statefulset.json index 9b09cc648..bc8362c54 100644 --- a/instances/modeling.mdt.papyrus/target/k8s/statefulset.json +++ b/instances/modeling.mdt.papyrus/target/k8s/statefulset.json @@ -51,7 +51,7 @@ "env": [ { "name": "JAVA_OPTS", - "value": "-showversion -XshowSettings:vm -XX:+AlwaysPreTouch -XX:+ParallelRefProcEnabled -XX:+DisableExplicitGC -Duser.timezone=America/Toronto -Dhudson.footerURL=https://ci.eclipse.org -Dhudson.model.UsageStatistics.disabled=true -Dhudson.lifecycle=hudson.lifecycle.ExitLifecycle -Djenkins.model.Jenkins.exitCodeOnRestart=0 -Djenkins.model.Jenkins.slaveAgentPort=50000 -Djenkins.model.Jenkins.slaveAgentPortEnforce=true -Djenkins.slaves.JnlpSlaveAgentProtocol3.enabled=false -Djenkins.install.runSetupWizard=false -Djenkins.ui.refresh=true -Djenkins.security.ManagePermission=true -Dorg.jenkinsci.plugins.durabletask.BourneShellScript.HEARTBEAT_CHECK_INTERVAL=7200 -DexecutableWar.jetty.disableCustomSessionIdCookieName=false -DexecutableWar.jetty.sessionIdCookieName=JSESSIONID.papyrus -Dcasc.jenkins.config=/etc/jenkins/jenkins.yaml -Dio.jenkins.plugins.casc.ConfigurationAsCode.initialDelay=5000 -Dorg.csanchez.jenkins.plugins.kubernetes.pipeline.PodTemplateStepExecution.defaultImage=docker.io/eclipsecbi/jiro-agent-basic-ubuntu:remoting-3261.v9c670a_4748a_9 -Dorg.csanchez.jenkins.plugins.kubernetes.PodTemplate.connectionTimeout=180 -Dkubernetes.websocket.ping.interval=30000" + "value": "-showversion -XshowSettings:vm -XX:+AlwaysPreTouch -XX:+ParallelRefProcEnabled -XX:+DisableExplicitGC -Duser.timezone=America/Toronto -Dhudson.footerURL=https://ci.eclipse.org -Dhudson.model.UsageStatistics.disabled=true -Dhudson.lifecycle=hudson.lifecycle.ExitLifecycle -Djenkins.model.Jenkins.exitCodeOnRestart=0 -Djenkins.model.Jenkins.slaveAgentPort=50000 -Djenkins.model.Jenkins.slaveAgentPortEnforce=true -Djenkins.slaves.JnlpSlaveAgentProtocol3.enabled=false -Djenkins.install.runSetupWizard=false -Djenkins.ui.refresh=true -Djenkins.security.ManagePermission=true -Dorg.jenkinsci.plugins.durabletask.BourneShellScript.HEARTBEAT_CHECK_INTERVAL=7200 -DexecutableWar.jetty.disableCustomSessionIdCookieName=false -DexecutableWar.jetty.sessionIdCookieName=JSESSIONID.papyrus -Dcasc.jenkins.config=/etc/jenkins/jenkins.yaml -Dio.jenkins.plugins.casc.ConfigurationAsCode.initialDelay=5000 -Dorg.csanchez.jenkins.plugins.kubernetes.pipeline.PodTemplateStepExecution.defaultImage=docker.io/eclipsecbi/jiro-agent-basic:remoting-3248.3250.v3277a_8e88c9b_ -Dorg.csanchez.jenkins.plugins.kubernetes.PodTemplate.connectionTimeout=180 -Dkubernetes.websocket.ping.interval=30000" }, { "name": "JENKINS_OPTS", @@ -66,7 +66,7 @@ "value": "true" } ], - "image": "docker.io/eclipsecbijenkins/modeling.mdt.papyrus:2.479.2", + "image": "docker.io/eclipsecbijenkins/modeling.mdt.papyrus:2.462.3", "imagePullPolicy": "Always", "lifecycle": { "preStop": {