From 1c7ef2c039f4aeccc3f9de109e77d2f2670d336f Mon Sep 17 00:00:00 2001 From: Frederic Gurr Date: Mon, 7 Oct 2024 20:00:42 +0200 Subject: [PATCH] Migrate to CephFS --- .../locationtech.geotrellis/config.jsonnet | 3 +- .../target/config.json | 226 +++++++++++++++++- .../target/jenkins/configuration.yml | 206 ++++++++++++++++ .../target/k8s/configmap-jenkins-config.yml | 206 ++++++++++++++++ .../target/k8s/m2-dir.json | 2 +- .../target/k8s/statefulset.json | 6 + instances/locationtech.jts/config.jsonnet | 1 + instances/locationtech.jts/target/config.json | 206 +++++++++++++++- .../target/jenkins/configuration.yml | 186 ++++++++++++++ .../target/k8s/configmap-jenkins-config.yml | 186 ++++++++++++++ .../locationtech.jts/target/k8s/m2-dir.json | 2 +- .../target/k8s/statefulset.json | 6 + instances/locationtech.proj4j/config.jsonnet | 1 + .../locationtech.proj4j/target/config.json | 206 +++++++++++++++- .../target/jenkins/configuration.yml | 186 ++++++++++++++ .../target/k8s/configmap-jenkins-config.yml | 186 ++++++++++++++ .../target/k8s/m2-dir.json | 2 +- .../target/k8s/statefulset.json | 6 + .../locationtech.spatial4j/config.jsonnet | 1 + .../locationtech.spatial4j/target/config.json | 206 +++++++++++++++- .../target/jenkins/configuration.yml | 186 ++++++++++++++ .../target/k8s/configmap-jenkins-config.yml | 186 ++++++++++++++ .../target/k8s/m2-dir.json | 2 +- .../target/k8s/statefulset.json | 6 + 24 files changed, 2391 insertions(+), 19 deletions(-) diff --git a/instances/locationtech.geotrellis/config.jsonnet b/instances/locationtech.geotrellis/config.jsonnet index d536ce7706..9af718556a 100644 --- a/instances/locationtech.geotrellis/config.jsonnet +++ b/instances/locationtech.geotrellis/config.jsonnet @@ -5,5 +5,6 @@ }, sbt+: { generate: true, - } + }, + seLinuxLevel: "s0:c40,c25", } diff --git a/instances/locationtech.geotrellis/target/config.json b/instances/locationtech.geotrellis/target/config.json index fbc539e9fa..021e358696 100644 --- a/instances/locationtech.geotrellis/target/config.json +++ b/instances/locationtech.geotrellis/target/config.json @@ -241,7 +241,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", @@ -352,7 +352,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", @@ -454,6 +454,227 @@ }, "startupScript": "/usr/local/bin/jenkins-agent", "username": "jenkins" + }, + "ubuntu-2204": { + "agentWorkdir": "/home/jenkins/jenkins-agent", + "docker": { + "aliases": [ + "docker.io/eclipsecbi/jiro-agent-ubuntu-2204:latest" + ], + "build_args": "['FROM_TAG': '22.04']", + "context": "ubuntu", + "dockerfile": "#*******************************************************************************\n# Copyright (c) 2020 Eclipse Foundation and others.\n# This program and the accompanying materials are made available\n# under the terms of the Eclipse Public License 2.0\n# which is available at http://www.eclipse.org/legal/epl-v20.html,\n# or the MIT License which is available at https://opensource.org/licenses/MIT.\n# SPDX-License-Identifier: EPL-2.0 OR MIT\n#*******************************************************************************\nFROM docker.io/eclipsecbi/jiro-agent-ubuntu-2204:spec\n\n# These environment variables will be used in the uid_entrypoint script from the parent image\nENV USER_NAME=\"jenkins\"\nENV HOME=\"/home/jenkins\"\n\nVOLUME [ \"/home/jenkins\", ]\nWORKDIR \"/home/jenkins\"\nENTRYPOINT [ \"/usr/local/bin/jenkins-agent\" ]\n\nADD \"https://repo.jenkins-ci.org/public/org/jenkins-ci/main/remoting/3206.3208.v409508a_675ff/remoting-3206.3208.v409508a_675ff.jar\" \"/usr/share/jenkins/agent.jar\"\nADD \"https://github.com/jenkinsci/docker-agent/raw/3206.vb_15dcf73f6a_9-12/jenkins-agent\" \"/usr/local/bin/jenkins-agent\"\n\nRUN sed -e 's/JAVA_OPTS/JAVA_OPTS \\$JENKINS_REMOTING_JAVA_OPTS/g' /usr/local/bin/jenkins-agent > /usr/local/bin/jenkins-agent.sed \\\n && mv /usr/local/bin/jenkins-agent.sed /usr/local/bin/jenkins-agent\n\nRUN chmod 755 \"$(dirname \"/usr/share/jenkins/agent.jar\")\" \\\n && chmod 644 \"/usr/share/jenkins/agent.jar\" \\\n && chmod ug+rx \"/usr/local/bin/jenkins-agent\" \\\n && chgrp 0 \"/usr/local/bin/jenkins-agent\"\n\nUSER 10001:0\n", + "image": "jiro-agent-ubuntu-2204", + "registry": "docker.io", + "repository": "eclipsecbi", + "tag": "remoting-3206.3208.v409508a_675ff" + }, + "env": { + "JAVA_TOOL_OPTIONS": [ ], + "JENKINS_REMOTING_JAVA_OPTS": [ + "-showversion", + "-XshowSettings:vm", + "-Xmx256m", + "-Dorg.jenkinsci.remoting.engine.JnlpProtocol3.disabled=true", + "-Dorg.jenkinsci.plugins.gitclient.CliGitAPIImpl.useSETSID=true" + ], + "OPENJ9_JAVA_OPTIONS": [ + "-XX:+IgnoreUnrecognizedVMOptions", + "-XX:+IdleTuningCompactOnIdle", + "-XX:+IdleTuningGcOnIdle" + ], + "_JAVA_OPTIONS": [ ] + }, + "home": "/home/jenkins", + "kubernetes": { + "inheritYamlMergeStrategy": true, + "resources": { + "cpu": { + "limit": "2000m", + "request": "1000m" + }, + "memory": { + "limit": "4096Mi", + "request": "4096Mi" + } + }, + "volumes": [ + { + "mounts": [ + { + "mountPath": "/home/jenkins/.m2/settings-security.xml", + "subPath": "settings-security.xml" + }, + { + "mountPath": "/home/jenkins/.m2/settings.xml", + "subPath": "settings.xml" + } + ], + "name": "m2-secret-dir", + "secret": { + "name": "m2-secret-dir" + } + }, + { + "configMap": { + "name": "m2-dir" + }, + "mounts": [ + { + "mountPath": "/home/jenkins/.m2/toolchains.xml", + "subPath": "toolchains.xml" + }, + { + "mountPath": "/home/jenkins/.mavenrc", + "subPath": ".mavenrc" + } + ], + "name": "m2-dir" + }, + { + "mounts": [ + { + "mountPath": "/home/jenkins/.sbt/.credentials", + "subPath": ".credentials" + } + ], + "name": "sbt-secret-dir", + "secret": { + "name": "sbt-secret-dir" + } + } + ], + "yamlMergeStrategy": "merge" + }, + "labels": [ + "ubuntu-2204" + ], + "maxHeap": "256m", + "mode": "EXCLUSIVE", + "name": "ubuntu-2204", + "remoting": { + "jar": "/usr/share/jenkins/agent.jar", + "startupScript": { + "name": "jenkins-agent", + "url": "https://github.com/jenkinsci/docker-agent/raw/3206.vb_15dcf73f6a_9-12/jenkins-agent", + "version": "3206.vb_15dcf73f6a_9-12" + }, + "url": "https://repo.jenkins-ci.org/public/org/jenkins-ci/main/remoting/3206.3208.v409508a_675ff/remoting-3206.3208.v409508a_675ff.jar", + "version": "3206.3208.v409508a_675ff" + }, + "startupScript": "/usr/local/bin/jenkins-agent", + "username": "jenkins" + }, + "ubuntu-2404": { + "agentWorkdir": "/home/jenkins/jenkins-agent", + "docker": { + "aliases": [ + "docker.io/eclipsecbi/jiro-agent-ubuntu-2404:latest" + ], + "build_args": "['FROM_TAG': '24.04']", + "context": "ubuntu", + "dockerfile": "#*******************************************************************************\n# Copyright (c) 2020 Eclipse Foundation and others.\n# This program and the accompanying materials are made available\n# under the terms of the Eclipse Public License 2.0\n# which is available at http://www.eclipse.org/legal/epl-v20.html,\n# or the MIT License which is available at https://opensource.org/licenses/MIT.\n# SPDX-License-Identifier: EPL-2.0 OR MIT\n#*******************************************************************************\nFROM docker.io/eclipsecbi/jiro-agent-ubuntu-2404:spec\n\n# These environment variables will be used in the uid_entrypoint script from the parent image\nENV USER_NAME=\"jenkins\"\nENV HOME=\"/home/jenkins\"\n\nVOLUME [ \"/home/jenkins\", ]\nWORKDIR \"/home/jenkins\"\nENTRYPOINT [ \"/usr/local/bin/jenkins-agent\" ]\n\nADD \"https://repo.jenkins-ci.org/public/org/jenkins-ci/main/remoting/3206.3208.v409508a_675ff/remoting-3206.3208.v409508a_675ff.jar\" \"/usr/share/jenkins/agent.jar\"\nADD \"https://github.com/jenkinsci/docker-agent/raw/3206.vb_15dcf73f6a_9-12/jenkins-agent\" \"/usr/local/bin/jenkins-agent\"\n\nRUN sed -e 's/JAVA_OPTS/JAVA_OPTS \\$JENKINS_REMOTING_JAVA_OPTS/g' /usr/local/bin/jenkins-agent > /usr/local/bin/jenkins-agent.sed \\\n && mv /usr/local/bin/jenkins-agent.sed /usr/local/bin/jenkins-agent\n\nRUN chmod 755 \"$(dirname \"/usr/share/jenkins/agent.jar\")\" \\\n && chmod 644 \"/usr/share/jenkins/agent.jar\" \\\n && chmod ug+rx \"/usr/local/bin/jenkins-agent\" \\\n && chgrp 0 \"/usr/local/bin/jenkins-agent\"\n\nUSER 10001:0\n", + "image": "jiro-agent-ubuntu-2404", + "registry": "docker.io", + "repository": "eclipsecbi", + "tag": "remoting-3206.3208.v409508a_675ff" + }, + "env": { + "JAVA_TOOL_OPTIONS": [ ], + "JENKINS_REMOTING_JAVA_OPTS": [ + "-showversion", + "-XshowSettings:vm", + "-Xmx256m", + "-Dorg.jenkinsci.remoting.engine.JnlpProtocol3.disabled=true", + "-Dorg.jenkinsci.plugins.gitclient.CliGitAPIImpl.useSETSID=true" + ], + "OPENJ9_JAVA_OPTIONS": [ + "-XX:+IgnoreUnrecognizedVMOptions", + "-XX:+IdleTuningCompactOnIdle", + "-XX:+IdleTuningGcOnIdle" + ], + "_JAVA_OPTIONS": [ ] + }, + "home": "/home/jenkins", + "kubernetes": { + "inheritYamlMergeStrategy": true, + "resources": { + "cpu": { + "limit": "2000m", + "request": "1000m" + }, + "memory": { + "limit": "4096Mi", + "request": "4096Mi" + } + }, + "volumes": [ + { + "mounts": [ + { + "mountPath": "/home/jenkins/.m2/settings-security.xml", + "subPath": "settings-security.xml" + }, + { + "mountPath": "/home/jenkins/.m2/settings.xml", + "subPath": "settings.xml" + } + ], + "name": "m2-secret-dir", + "secret": { + "name": "m2-secret-dir" + } + }, + { + "configMap": { + "name": "m2-dir" + }, + "mounts": [ + { + "mountPath": "/home/jenkins/.m2/toolchains.xml", + "subPath": "toolchains.xml" + }, + { + "mountPath": "/home/jenkins/.mavenrc", + "subPath": ".mavenrc" + } + ], + "name": "m2-dir" + }, + { + "mounts": [ + { + "mountPath": "/home/jenkins/.sbt/.credentials", + "subPath": ".credentials" + } + ], + "name": "sbt-secret-dir", + "secret": { + "name": "sbt-secret-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" } } } @@ -747,6 +968,7 @@ }, "generate": true }, + "seLinuxLevel": "s0:c40,c25", "secrets": { "dockerconfigjson": { "dockerconfigjson-for-pull-as-default": { diff --git a/instances/locationtech.geotrellis/target/jenkins/configuration.yml b/instances/locationtech.geotrellis/target/jenkins/configuration.yml index 23d787848c..3e5a6b929f 100644 --- a/instances/locationtech.geotrellis/target/jenkins/configuration.yml +++ b/instances/locationtech.geotrellis/target/jenkins/configuration.yml @@ -481,6 +481,208 @@ jenkins: secretName: sbt-secret-dir inheritYamlMergeStrategy: "true" yamlMergeStrategy: "merge" + - name: "ubuntu-2204" + namespace: "geotrellis" + 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-geotrellis" + 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" + - emptyDirVolume: + memory: false + mountPath: "/home/jenkins/.sbt" + 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 + - name: sbt-secret-dir + mountPath: /home/jenkins/.sbt/.credentials + subPath: .credentials + readOnly: true + volumes: + - name: m2-secret-dir + secret: + secretName: m2-secret-dir + - name: m2-dir + configMap: + name: m2-dir + - name: sbt-secret-dir + secret: + secretName: sbt-secret-dir + inheritYamlMergeStrategy: "true" + yamlMergeStrategy: "merge" + - name: "ubuntu-2404" + namespace: "geotrellis" + 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-geotrellis" + 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" + - emptyDirVolume: + memory: false + mountPath: "/home/jenkins/.sbt" + 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 + - name: sbt-secret-dir + mountPath: /home/jenkins/.sbt/.credentials + subPath: .credentials + readOnly: true + volumes: + - name: m2-secret-dir + secret: + secretName: m2-secret-dir + - name: m2-dir + configMap: + name: m2-dir + - name: sbt-secret-dir + secret: + secretName: sbt-secret-dir + inheritYamlMergeStrategy: "true" + yamlMergeStrategy: "merge" security: apiToken: creationOfLegacyTokenEnabled: false @@ -575,6 +777,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" @@ -704,6 +908,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/locationtech.geotrellis/target/k8s/configmap-jenkins-config.yml b/instances/locationtech.geotrellis/target/k8s/configmap-jenkins-config.yml index 3a94a565a4..6ba9a71b28 100644 --- a/instances/locationtech.geotrellis/target/k8s/configmap-jenkins-config.yml +++ b/instances/locationtech.geotrellis/target/k8s/configmap-jenkins-config.yml @@ -504,6 +504,208 @@ data: secretName: sbt-secret-dir inheritYamlMergeStrategy: "true" yamlMergeStrategy: "merge" + - name: "ubuntu-2204" + namespace: "geotrellis" + 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-geotrellis" + 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" + - emptyDirVolume: + memory: false + mountPath: "/home/jenkins/.sbt" + 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 + - name: sbt-secret-dir + mountPath: /home/jenkins/.sbt/.credentials + subPath: .credentials + readOnly: true + volumes: + - name: m2-secret-dir + secret: + secretName: m2-secret-dir + - name: m2-dir + configMap: + name: m2-dir + - name: sbt-secret-dir + secret: + secretName: sbt-secret-dir + inheritYamlMergeStrategy: "true" + yamlMergeStrategy: "merge" + - name: "ubuntu-2404" + namespace: "geotrellis" + 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-geotrellis" + 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" + - emptyDirVolume: + memory: false + mountPath: "/home/jenkins/.sbt" + 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 + - name: sbt-secret-dir + mountPath: /home/jenkins/.sbt/.credentials + subPath: .credentials + readOnly: true + volumes: + - name: m2-secret-dir + secret: + secretName: m2-secret-dir + - name: m2-dir + configMap: + name: m2-dir + - name: sbt-secret-dir + secret: + secretName: sbt-secret-dir + inheritYamlMergeStrategy: "true" + yamlMergeStrategy: "merge" security: apiToken: creationOfLegacyTokenEnabled: false @@ -598,6 +800,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" @@ -727,6 +931,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/locationtech.geotrellis/target/k8s/m2-dir.json b/instances/locationtech.geotrellis/target/k8s/m2-dir.json index 438c316136..4e28633cfe 100644 --- a/instances/locationtech.geotrellis/target/k8s/m2-dir.json +++ b/instances/locationtech.geotrellis/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/locationtech.geotrellis/target/k8s/statefulset.json b/instances/locationtech.geotrellis/target/k8s/statefulset.json index 1c80b3edfb..e6edb1984c 100644 --- a/instances/locationtech.geotrellis/target/k8s/statefulset.json +++ b/instances/locationtech.geotrellis/target/k8s/statefulset.json @@ -119,6 +119,12 @@ "cpu": "250m" } }, + "securityContext": { + "seLinuxOptions": { + "level": "s0:c40,c25", + "type": "spc_t" + } + }, "volumeMounts": [ { "mountPath": "/var/jenkins", diff --git a/instances/locationtech.jts/config.jsonnet b/instances/locationtech.jts/config.jsonnet index b7dc7b00fe..3703bf7f62 100644 --- a/instances/locationtech.jts/config.jsonnet +++ b/instances/locationtech.jts/config.jsonnet @@ -3,4 +3,5 @@ fullName: "locationtech.jts", displayName: "LocationTech JTS Topology Suite", }, + seLinuxLevel: "s0:c45,c15", } diff --git a/instances/locationtech.jts/target/config.json b/instances/locationtech.jts/target/config.json index 0dbdc46932..776bba2304 100644 --- a/instances/locationtech.jts/target/config.json +++ b/instances/locationtech.jts/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" } } } @@ -699,6 +896,7 @@ }, "generate": false }, + "seLinuxLevel": "s0:c45,c15", "secrets": { "dockerconfigjson": { "dockerconfigjson-for-pull-as-default": { diff --git a/instances/locationtech.jts/target/jenkins/configuration.yml b/instances/locationtech.jts/target/jenkins/configuration.yml index b854e4468d..85ab68f5e2 100644 --- a/instances/locationtech.jts/target/jenkins/configuration.yml +++ b/instances/locationtech.jts/target/jenkins/configuration.yml @@ -441,6 +441,188 @@ jenkins: name: m2-dir inheritYamlMergeStrategy: "true" yamlMergeStrategy: "merge" + - name: "ubuntu-2204" + namespace: "jts" + 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-jts" + 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: "jts" + 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-jts" + mountPath: "/opt/tools" + readOnly: true + - configMapVolume: + configMapName: "known-hosts" + mountPath: "/home/jenkins/.ssh/" + subPath: "." + - emptyDirVolume: + memory: false + mountPath: "/home/jenkins/" + - emptyDirVolume: + memory: false + mountPath: "/home/jenkins/.m2/repository" + - emptyDirVolume: + memory: false + mountPath: "/home/jenkins/.m2/wrapper" + workspaceVolume: + emptyDirWorkspaceVolume: + memory: false + yaml: | + apiVersion: v1 + kind: Pod + spec: + containers: + - name: jnlp + resources: + limits: + cpu: "2000m" + memory: "4096Mi" + requests: + cpu: "1000m" + memory: "4096Mi" + volumeMounts: + - name: m2-secret-dir + mountPath: /home/jenkins/.m2/settings-security.xml + subPath: settings-security.xml + readOnly: true + - name: m2-secret-dir + mountPath: /home/jenkins/.m2/settings.xml + subPath: settings.xml + readOnly: true + - name: m2-dir + mountPath: /home/jenkins/.m2/toolchains.xml + subPath: toolchains.xml + readOnly: true + - name: m2-dir + mountPath: /home/jenkins/.mavenrc + subPath: .mavenrc + readOnly: true + volumes: + - name: m2-secret-dir + secret: + secretName: m2-secret-dir + - name: m2-dir + configMap: + name: m2-dir + inheritYamlMergeStrategy: "true" + yamlMergeStrategy: "merge" security: apiToken: creationOfLegacyTokenEnabled: false @@ -535,6 +717,8 @@ tool: home: "/opt/tools/java/openjdk/latest" - name: "openjdk-ea-latest" home: "/opt/tools/java/openjdk/ea-latest" + - name: "openjdk-jdk24-latest" + home: "/opt/tools/java/openjdk/jdk-24/latest" - name: "openjdk-jdk23-latest" home: "/opt/tools/java/openjdk/jdk-23/latest" - name: "openjdk-jdk22-latest" @@ -664,6 +848,8 @@ tool: installations: - name: "apache-maven-latest" home: "/opt/tools/apache-maven/latest" + - name: "apache-maven-3.9.9" + home: "/opt/tools/apache-maven/3.9.9" - name: "apache-maven-3.9.6" home: "/opt/tools/apache-maven/3.9.6" - name: "apache-maven-3.9.5" diff --git a/instances/locationtech.jts/target/k8s/configmap-jenkins-config.yml b/instances/locationtech.jts/target/k8s/configmap-jenkins-config.yml index b0aa3b249c..df26635213 100644 --- a/instances/locationtech.jts/target/k8s/configmap-jenkins-config.yml +++ b/instances/locationtech.jts/target/k8s/configmap-jenkins-config.yml @@ -464,6 +464,188 @@ data: name: m2-dir inheritYamlMergeStrategy: "true" yamlMergeStrategy: "merge" + - name: "ubuntu-2204" + namespace: "jts" + 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-jts" + 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: "jts" + 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-jts" + mountPath: "/opt/tools" + readOnly: true + - configMapVolume: + configMapName: "known-hosts" + mountPath: "/home/jenkins/.ssh/" + subPath: "." + - emptyDirVolume: + memory: false + mountPath: "/home/jenkins/" + - emptyDirVolume: + memory: false + mountPath: "/home/jenkins/.m2/repository" + - emptyDirVolume: + memory: false + mountPath: "/home/jenkins/.m2/wrapper" + workspaceVolume: + emptyDirWorkspaceVolume: + memory: false + yaml: | + apiVersion: v1 + kind: Pod + spec: + containers: + - name: jnlp + resources: + limits: + cpu: "2000m" + memory: "4096Mi" + requests: + cpu: "1000m" + memory: "4096Mi" + volumeMounts: + - name: m2-secret-dir + mountPath: /home/jenkins/.m2/settings-security.xml + subPath: settings-security.xml + readOnly: true + - name: m2-secret-dir + mountPath: /home/jenkins/.m2/settings.xml + subPath: settings.xml + readOnly: true + - name: m2-dir + mountPath: /home/jenkins/.m2/toolchains.xml + subPath: toolchains.xml + readOnly: true + - name: m2-dir + mountPath: /home/jenkins/.mavenrc + subPath: .mavenrc + readOnly: true + volumes: + - name: m2-secret-dir + secret: + secretName: m2-secret-dir + - name: m2-dir + configMap: + name: m2-dir + inheritYamlMergeStrategy: "true" + yamlMergeStrategy: "merge" security: apiToken: creationOfLegacyTokenEnabled: false @@ -558,6 +740,8 @@ data: home: "/opt/tools/java/openjdk/latest" - name: "openjdk-ea-latest" home: "/opt/tools/java/openjdk/ea-latest" + - name: "openjdk-jdk24-latest" + home: "/opt/tools/java/openjdk/jdk-24/latest" - name: "openjdk-jdk23-latest" home: "/opt/tools/java/openjdk/jdk-23/latest" - name: "openjdk-jdk22-latest" @@ -687,6 +871,8 @@ data: installations: - name: "apache-maven-latest" home: "/opt/tools/apache-maven/latest" + - name: "apache-maven-3.9.9" + home: "/opt/tools/apache-maven/3.9.9" - name: "apache-maven-3.9.6" home: "/opt/tools/apache-maven/3.9.6" - name: "apache-maven-3.9.5" diff --git a/instances/locationtech.jts/target/k8s/m2-dir.json b/instances/locationtech.jts/target/k8s/m2-dir.json index 4f17993134..51b77634b6 100644 --- a/instances/locationtech.jts/target/k8s/m2-dir.json +++ b/instances/locationtech.jts/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/locationtech.jts/target/k8s/statefulset.json b/instances/locationtech.jts/target/k8s/statefulset.json index edb7098660..59c9109a1b 100644 --- a/instances/locationtech.jts/target/k8s/statefulset.json +++ b/instances/locationtech.jts/target/k8s/statefulset.json @@ -119,6 +119,12 @@ "cpu": "250m" } }, + "securityContext": { + "seLinuxOptions": { + "level": "s0:c45,c15", + "type": "spc_t" + } + }, "volumeMounts": [ { "mountPath": "/var/jenkins", diff --git a/instances/locationtech.proj4j/config.jsonnet b/instances/locationtech.proj4j/config.jsonnet index 607ef3ec28..a5cb507d16 100644 --- a/instances/locationtech.proj4j/config.jsonnet +++ b/instances/locationtech.proj4j/config.jsonnet @@ -3,4 +3,5 @@ fullName: "locationtech.proj4j", displayName: "LocationTech Proj4J", }, + seLinuxLevel: "s0:c51,c40", } diff --git a/instances/locationtech.proj4j/target/config.json b/instances/locationtech.proj4j/target/config.json index f0dff75dc9..a1d9632c4e 100644 --- a/instances/locationtech.proj4j/target/config.json +++ b/instances/locationtech.proj4j/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" } } } @@ -699,6 +896,7 @@ }, "generate": false }, + "seLinuxLevel": "s0:c51,c40", "secrets": { "dockerconfigjson": { "dockerconfigjson-for-pull-as-default": { diff --git a/instances/locationtech.proj4j/target/jenkins/configuration.yml b/instances/locationtech.proj4j/target/jenkins/configuration.yml index b5601d6f7d..dc043b25db 100644 --- a/instances/locationtech.proj4j/target/jenkins/configuration.yml +++ b/instances/locationtech.proj4j/target/jenkins/configuration.yml @@ -441,6 +441,188 @@ jenkins: name: m2-dir inheritYamlMergeStrategy: "true" yamlMergeStrategy: "merge" + - name: "ubuntu-2204" + namespace: "proj4j" + 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-proj4j" + 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: "proj4j" + 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-proj4j" + mountPath: "/opt/tools" + readOnly: true + - configMapVolume: + configMapName: "known-hosts" + mountPath: "/home/jenkins/.ssh/" + subPath: "." + - emptyDirVolume: + memory: false + mountPath: "/home/jenkins/" + - emptyDirVolume: + memory: false + mountPath: "/home/jenkins/.m2/repository" + - emptyDirVolume: + memory: false + mountPath: "/home/jenkins/.m2/wrapper" + workspaceVolume: + emptyDirWorkspaceVolume: + memory: false + yaml: | + apiVersion: v1 + kind: Pod + spec: + containers: + - name: jnlp + resources: + limits: + cpu: "2000m" + memory: "4096Mi" + requests: + cpu: "1000m" + memory: "4096Mi" + volumeMounts: + - name: m2-secret-dir + mountPath: /home/jenkins/.m2/settings-security.xml + subPath: settings-security.xml + readOnly: true + - name: m2-secret-dir + mountPath: /home/jenkins/.m2/settings.xml + subPath: settings.xml + readOnly: true + - name: m2-dir + mountPath: /home/jenkins/.m2/toolchains.xml + subPath: toolchains.xml + readOnly: true + - name: m2-dir + mountPath: /home/jenkins/.mavenrc + subPath: .mavenrc + readOnly: true + volumes: + - name: m2-secret-dir + secret: + secretName: m2-secret-dir + - name: m2-dir + configMap: + name: m2-dir + inheritYamlMergeStrategy: "true" + yamlMergeStrategy: "merge" security: apiToken: creationOfLegacyTokenEnabled: false @@ -535,6 +717,8 @@ tool: home: "/opt/tools/java/openjdk/latest" - name: "openjdk-ea-latest" home: "/opt/tools/java/openjdk/ea-latest" + - name: "openjdk-jdk24-latest" + home: "/opt/tools/java/openjdk/jdk-24/latest" - name: "openjdk-jdk23-latest" home: "/opt/tools/java/openjdk/jdk-23/latest" - name: "openjdk-jdk22-latest" @@ -664,6 +848,8 @@ tool: installations: - name: "apache-maven-latest" home: "/opt/tools/apache-maven/latest" + - name: "apache-maven-3.9.9" + home: "/opt/tools/apache-maven/3.9.9" - name: "apache-maven-3.9.6" home: "/opt/tools/apache-maven/3.9.6" - name: "apache-maven-3.9.5" diff --git a/instances/locationtech.proj4j/target/k8s/configmap-jenkins-config.yml b/instances/locationtech.proj4j/target/k8s/configmap-jenkins-config.yml index e127e85340..3f2ea1b8cc 100644 --- a/instances/locationtech.proj4j/target/k8s/configmap-jenkins-config.yml +++ b/instances/locationtech.proj4j/target/k8s/configmap-jenkins-config.yml @@ -464,6 +464,188 @@ data: name: m2-dir inheritYamlMergeStrategy: "true" yamlMergeStrategy: "merge" + - name: "ubuntu-2204" + namespace: "proj4j" + 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-proj4j" + 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: "proj4j" + 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-proj4j" + mountPath: "/opt/tools" + readOnly: true + - configMapVolume: + configMapName: "known-hosts" + mountPath: "/home/jenkins/.ssh/" + subPath: "." + - emptyDirVolume: + memory: false + mountPath: "/home/jenkins/" + - emptyDirVolume: + memory: false + mountPath: "/home/jenkins/.m2/repository" + - emptyDirVolume: + memory: false + mountPath: "/home/jenkins/.m2/wrapper" + workspaceVolume: + emptyDirWorkspaceVolume: + memory: false + yaml: | + apiVersion: v1 + kind: Pod + spec: + containers: + - name: jnlp + resources: + limits: + cpu: "2000m" + memory: "4096Mi" + requests: + cpu: "1000m" + memory: "4096Mi" + volumeMounts: + - name: m2-secret-dir + mountPath: /home/jenkins/.m2/settings-security.xml + subPath: settings-security.xml + readOnly: true + - name: m2-secret-dir + mountPath: /home/jenkins/.m2/settings.xml + subPath: settings.xml + readOnly: true + - name: m2-dir + mountPath: /home/jenkins/.m2/toolchains.xml + subPath: toolchains.xml + readOnly: true + - name: m2-dir + mountPath: /home/jenkins/.mavenrc + subPath: .mavenrc + readOnly: true + volumes: + - name: m2-secret-dir + secret: + secretName: m2-secret-dir + - name: m2-dir + configMap: + name: m2-dir + inheritYamlMergeStrategy: "true" + yamlMergeStrategy: "merge" security: apiToken: creationOfLegacyTokenEnabled: false @@ -558,6 +740,8 @@ data: home: "/opt/tools/java/openjdk/latest" - name: "openjdk-ea-latest" home: "/opt/tools/java/openjdk/ea-latest" + - name: "openjdk-jdk24-latest" + home: "/opt/tools/java/openjdk/jdk-24/latest" - name: "openjdk-jdk23-latest" home: "/opt/tools/java/openjdk/jdk-23/latest" - name: "openjdk-jdk22-latest" @@ -687,6 +871,8 @@ data: installations: - name: "apache-maven-latest" home: "/opt/tools/apache-maven/latest" + - name: "apache-maven-3.9.9" + home: "/opt/tools/apache-maven/3.9.9" - name: "apache-maven-3.9.6" home: "/opt/tools/apache-maven/3.9.6" - name: "apache-maven-3.9.5" diff --git a/instances/locationtech.proj4j/target/k8s/m2-dir.json b/instances/locationtech.proj4j/target/k8s/m2-dir.json index ddc9f0ecbe..d03df8c437 100644 --- a/instances/locationtech.proj4j/target/k8s/m2-dir.json +++ b/instances/locationtech.proj4j/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/locationtech.proj4j/target/k8s/statefulset.json b/instances/locationtech.proj4j/target/k8s/statefulset.json index e09f72c258..22c874a89e 100644 --- a/instances/locationtech.proj4j/target/k8s/statefulset.json +++ b/instances/locationtech.proj4j/target/k8s/statefulset.json @@ -119,6 +119,12 @@ "cpu": "250m" } }, + "securityContext": { + "seLinuxOptions": { + "level": "s0:c51,c40", + "type": "spc_t" + } + }, "volumeMounts": [ { "mountPath": "/var/jenkins", diff --git a/instances/locationtech.spatial4j/config.jsonnet b/instances/locationtech.spatial4j/config.jsonnet index 7198864e6a..d206df32a3 100644 --- a/instances/locationtech.spatial4j/config.jsonnet +++ b/instances/locationtech.spatial4j/config.jsonnet @@ -3,4 +3,5 @@ fullName: "locationtech.spatial4j", displayName: "LocationTech Spatial4j", }, + seLinuxLevel: "s0:c54,c4", } diff --git a/instances/locationtech.spatial4j/target/config.json b/instances/locationtech.spatial4j/target/config.json index c757c8df9c..b5a0637355 100644 --- a/instances/locationtech.spatial4j/target/config.json +++ b/instances/locationtech.spatial4j/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" } } } @@ -699,6 +896,7 @@ }, "generate": false }, + "seLinuxLevel": "s0:c54,c4", "secrets": { "dockerconfigjson": { "dockerconfigjson-for-pull-as-default": { diff --git a/instances/locationtech.spatial4j/target/jenkins/configuration.yml b/instances/locationtech.spatial4j/target/jenkins/configuration.yml index ec5e91c9eb..90e457e770 100644 --- a/instances/locationtech.spatial4j/target/jenkins/configuration.yml +++ b/instances/locationtech.spatial4j/target/jenkins/configuration.yml @@ -441,6 +441,188 @@ jenkins: name: m2-dir inheritYamlMergeStrategy: "true" yamlMergeStrategy: "merge" + - name: "ubuntu-2204" + namespace: "spatial4j" + 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-spatial4j" + 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: "spatial4j" + 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-spatial4j" + mountPath: "/opt/tools" + readOnly: true + - configMapVolume: + configMapName: "known-hosts" + mountPath: "/home/jenkins/.ssh/" + subPath: "." + - emptyDirVolume: + memory: false + mountPath: "/home/jenkins/" + - emptyDirVolume: + memory: false + mountPath: "/home/jenkins/.m2/repository" + - emptyDirVolume: + memory: false + mountPath: "/home/jenkins/.m2/wrapper" + workspaceVolume: + emptyDirWorkspaceVolume: + memory: false + yaml: | + apiVersion: v1 + kind: Pod + spec: + containers: + - name: jnlp + resources: + limits: + cpu: "2000m" + memory: "4096Mi" + requests: + cpu: "1000m" + memory: "4096Mi" + volumeMounts: + - name: m2-secret-dir + mountPath: /home/jenkins/.m2/settings-security.xml + subPath: settings-security.xml + readOnly: true + - name: m2-secret-dir + mountPath: /home/jenkins/.m2/settings.xml + subPath: settings.xml + readOnly: true + - name: m2-dir + mountPath: /home/jenkins/.m2/toolchains.xml + subPath: toolchains.xml + readOnly: true + - name: m2-dir + mountPath: /home/jenkins/.mavenrc + subPath: .mavenrc + readOnly: true + volumes: + - name: m2-secret-dir + secret: + secretName: m2-secret-dir + - name: m2-dir + configMap: + name: m2-dir + inheritYamlMergeStrategy: "true" + yamlMergeStrategy: "merge" security: apiToken: creationOfLegacyTokenEnabled: false @@ -535,6 +717,8 @@ tool: home: "/opt/tools/java/openjdk/latest" - name: "openjdk-ea-latest" home: "/opt/tools/java/openjdk/ea-latest" + - name: "openjdk-jdk24-latest" + home: "/opt/tools/java/openjdk/jdk-24/latest" - name: "openjdk-jdk23-latest" home: "/opt/tools/java/openjdk/jdk-23/latest" - name: "openjdk-jdk22-latest" @@ -664,6 +848,8 @@ tool: installations: - name: "apache-maven-latest" home: "/opt/tools/apache-maven/latest" + - name: "apache-maven-3.9.9" + home: "/opt/tools/apache-maven/3.9.9" - name: "apache-maven-3.9.6" home: "/opt/tools/apache-maven/3.9.6" - name: "apache-maven-3.9.5" diff --git a/instances/locationtech.spatial4j/target/k8s/configmap-jenkins-config.yml b/instances/locationtech.spatial4j/target/k8s/configmap-jenkins-config.yml index 23d1573930..eb051204c2 100644 --- a/instances/locationtech.spatial4j/target/k8s/configmap-jenkins-config.yml +++ b/instances/locationtech.spatial4j/target/k8s/configmap-jenkins-config.yml @@ -464,6 +464,188 @@ data: name: m2-dir inheritYamlMergeStrategy: "true" yamlMergeStrategy: "merge" + - name: "ubuntu-2204" + namespace: "spatial4j" + 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-spatial4j" + 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: "spatial4j" + 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-spatial4j" + mountPath: "/opt/tools" + readOnly: true + - configMapVolume: + configMapName: "known-hosts" + mountPath: "/home/jenkins/.ssh/" + subPath: "." + - emptyDirVolume: + memory: false + mountPath: "/home/jenkins/" + - emptyDirVolume: + memory: false + mountPath: "/home/jenkins/.m2/repository" + - emptyDirVolume: + memory: false + mountPath: "/home/jenkins/.m2/wrapper" + workspaceVolume: + emptyDirWorkspaceVolume: + memory: false + yaml: | + apiVersion: v1 + kind: Pod + spec: + containers: + - name: jnlp + resources: + limits: + cpu: "2000m" + memory: "4096Mi" + requests: + cpu: "1000m" + memory: "4096Mi" + volumeMounts: + - name: m2-secret-dir + mountPath: /home/jenkins/.m2/settings-security.xml + subPath: settings-security.xml + readOnly: true + - name: m2-secret-dir + mountPath: /home/jenkins/.m2/settings.xml + subPath: settings.xml + readOnly: true + - name: m2-dir + mountPath: /home/jenkins/.m2/toolchains.xml + subPath: toolchains.xml + readOnly: true + - name: m2-dir + mountPath: /home/jenkins/.mavenrc + subPath: .mavenrc + readOnly: true + volumes: + - name: m2-secret-dir + secret: + secretName: m2-secret-dir + - name: m2-dir + configMap: + name: m2-dir + inheritYamlMergeStrategy: "true" + yamlMergeStrategy: "merge" security: apiToken: creationOfLegacyTokenEnabled: false @@ -558,6 +740,8 @@ data: home: "/opt/tools/java/openjdk/latest" - name: "openjdk-ea-latest" home: "/opt/tools/java/openjdk/ea-latest" + - name: "openjdk-jdk24-latest" + home: "/opt/tools/java/openjdk/jdk-24/latest" - name: "openjdk-jdk23-latest" home: "/opt/tools/java/openjdk/jdk-23/latest" - name: "openjdk-jdk22-latest" @@ -687,6 +871,8 @@ data: installations: - name: "apache-maven-latest" home: "/opt/tools/apache-maven/latest" + - name: "apache-maven-3.9.9" + home: "/opt/tools/apache-maven/3.9.9" - name: "apache-maven-3.9.6" home: "/opt/tools/apache-maven/3.9.6" - name: "apache-maven-3.9.5" diff --git a/instances/locationtech.spatial4j/target/k8s/m2-dir.json b/instances/locationtech.spatial4j/target/k8s/m2-dir.json index 80f006d794..3fe619dd12 100644 --- a/instances/locationtech.spatial4j/target/k8s/m2-dir.json +++ b/instances/locationtech.spatial4j/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/locationtech.spatial4j/target/k8s/statefulset.json b/instances/locationtech.spatial4j/target/k8s/statefulset.json index 2321086432..beb91c87d2 100644 --- a/instances/locationtech.spatial4j/target/k8s/statefulset.json +++ b/instances/locationtech.spatial4j/target/k8s/statefulset.json @@ -119,6 +119,12 @@ "cpu": "250m" } }, + "securityContext": { + "seLinuxOptions": { + "level": "s0:c54,c4", + "type": "spc_t" + } + }, "volumeMounts": [ { "mountPath": "/var/jenkins",