Skip to content

Commit

Permalink
Jenkins LTS upgrade follow-up
Browse files Browse the repository at this point in the history
fredg02 committed Nov 29, 2024

Verified

This commit was signed with the committer’s verified signature.
fredg02 Fred G
1 parent d87217d commit cd2944f
Showing 24 changed files with 326 additions and 3,658 deletions.

Large diffs are not rendered by default.

Original file line number Diff line number Diff line change
@@ -79,98 +79,7 @@ jenkins:
templates:
- name: "basic"
namespace: "jakartaee-spec-committee"
label: "basic"
containers:
- name: "jnlp"
image: docker.io/eclipsecbi/jiro-agent-basic:remoting-3261.v9c670a_4748a_9
alwaysPullImage: true
livenessProbe:
failureThreshold: 0
initialDelaySeconds: 0
periodSeconds: 0
successThreshold: 0
timeoutSeconds: 0
ttyEnabled: true
command: ""
args: ""
instanceCap: -1
nodeUsageMode: EXCLUSIVE
envVars:
- envVar:
key: "JAVA_TOOL_OPTIONS"
value: ""
- envVar:
key: "JENKINS_REMOTING_JAVA_OPTS"
value: "-showversion -XshowSettings:vm -Xmx256m -Dorg.jenkinsci.remoting.engine.JnlpProtocol3.disabled=true -Dorg.jenkinsci.plugins.gitclient.CliGitAPIImpl.useSETSID=true"
- envVar:
key: "OPENJ9_JAVA_OPTIONS"
value: "-XX:+IgnoreUnrecognizedVMOptions -XX:+IdleTuningCompactOnIdle -XX:+IdleTuningGcOnIdle"
- envVar:
key: "_JAVA_OPTIONS"
value: ""
volumes:
- persistentVolumeClaim:
claimName: "tools-claim-jiro-jakartaee-spec-committee"
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: "basic-ubuntu"
namespace: "jakartaee-spec-committee"
label: "basic-ubuntu"
label: "basic basic-ubuntu"
containers:
- name: "jnlp"
image: docker.io/eclipsecbi/jiro-agent-basic-ubuntu:remoting-3261.v9c670a_4748a_9
@@ -259,188 +168,6 @@ jenkins:
name: m2-dir
inheritYamlMergeStrategy: "true"
yamlMergeStrategy: "merge"
- name: "centos-7"
namespace: "jakartaee-spec-committee"
label: "migration jipp-migration centos-7"
containers:
- name: "jnlp"
image: docker.io/eclipsecbi/jiro-agent-centos-7:remoting-3261.v9c670a_4748a_9
alwaysPullImage: true
livenessProbe:
failureThreshold: 0
initialDelaySeconds: 0
periodSeconds: 0
successThreshold: 0
timeoutSeconds: 0
ttyEnabled: true
command: ""
args: ""
instanceCap: -1
nodeUsageMode: EXCLUSIVE
envVars:
- envVar:
key: "JAVA_TOOL_OPTIONS"
value: ""
- envVar:
key: "JENKINS_REMOTING_JAVA_OPTS"
value: "-showversion -XshowSettings:vm -Xmx256m -Dorg.jenkinsci.remoting.engine.JnlpProtocol3.disabled=true -Dorg.jenkinsci.plugins.gitclient.CliGitAPIImpl.useSETSID=true"
- envVar:
key: "OPENJ9_JAVA_OPTIONS"
value: "-XX:+IgnoreUnrecognizedVMOptions -XX:+IdleTuningCompactOnIdle -XX:+IdleTuningGcOnIdle"
- envVar:
key: "_JAVA_OPTIONS"
value: ""
volumes:
- persistentVolumeClaim:
claimName: "tools-claim-jiro-jakartaee-spec-committee"
mountPath: "/opt/tools"
readOnly: true
- configMapVolume:
configMapName: "known-hosts"
mountPath: "/home/jenkins/.ssh/"
subPath: "."
- emptyDirVolume:
memory: false
mountPath: "/home/jenkins/"
- emptyDirVolume:
memory: false
mountPath: "/home/jenkins/.m2/repository"
- emptyDirVolume:
memory: false
mountPath: "/home/jenkins/.m2/wrapper"
workspaceVolume:
emptyDirWorkspaceVolume:
memory: false
yaml: |
apiVersion: v1
kind: Pod
spec:
containers:
- name: jnlp
resources:
limits:
cpu: "2000m"
memory: "4096Mi"
requests:
cpu: "1000m"
memory: "4096Mi"
volumeMounts:
- name: m2-secret-dir
mountPath: /home/jenkins/.m2/settings-security.xml
subPath: settings-security.xml
readOnly: true
- name: m2-secret-dir
mountPath: /home/jenkins/.m2/settings.xml
subPath: settings.xml
readOnly: true
- name: m2-dir
mountPath: /home/jenkins/.m2/toolchains.xml
subPath: toolchains.xml
readOnly: true
- name: m2-dir
mountPath: /home/jenkins/.mavenrc
subPath: .mavenrc
readOnly: true
volumes:
- name: m2-secret-dir
secret:
secretName: m2-secret-dir
- name: m2-dir
configMap:
name: m2-dir
inheritYamlMergeStrategy: "true"
yamlMergeStrategy: "merge"
- name: "centos-8"
namespace: "jakartaee-spec-committee"
label: "centos-latest centos-8"
containers:
- name: "jnlp"
image: docker.io/eclipsecbi/jiro-agent-centos-8:remoting-3261.v9c670a_4748a_9
alwaysPullImage: true
livenessProbe:
failureThreshold: 0
initialDelaySeconds: 0
periodSeconds: 0
successThreshold: 0
timeoutSeconds: 0
ttyEnabled: true
command: ""
args: ""
instanceCap: -1
nodeUsageMode: EXCLUSIVE
envVars:
- envVar:
key: "JAVA_TOOL_OPTIONS"
value: ""
- envVar:
key: "JENKINS_REMOTING_JAVA_OPTS"
value: "-showversion -XshowSettings:vm -Xmx256m -Dorg.jenkinsci.remoting.engine.JnlpProtocol3.disabled=true -Dorg.jenkinsci.plugins.gitclient.CliGitAPIImpl.useSETSID=true"
- envVar:
key: "OPENJ9_JAVA_OPTIONS"
value: "-XX:+IgnoreUnrecognizedVMOptions -XX:+IdleTuningCompactOnIdle -XX:+IdleTuningGcOnIdle"
- envVar:
key: "_JAVA_OPTIONS"
value: ""
volumes:
- persistentVolumeClaim:
claimName: "tools-claim-jiro-jakartaee-spec-committee"
mountPath: "/opt/tools"
readOnly: true
- configMapVolume:
configMapName: "known-hosts"
mountPath: "/home/jenkins/.ssh/"
subPath: "."
- emptyDirVolume:
memory: false
mountPath: "/home/jenkins/"
- emptyDirVolume:
memory: false
mountPath: "/home/jenkins/.m2/repository"
- emptyDirVolume:
memory: false
mountPath: "/home/jenkins/.m2/wrapper"
workspaceVolume:
emptyDirWorkspaceVolume:
memory: false
yaml: |
apiVersion: v1
kind: Pod
spec:
containers:
- name: jnlp
resources:
limits:
cpu: "2000m"
memory: "4096Mi"
requests:
cpu: "1000m"
memory: "4096Mi"
volumeMounts:
- name: m2-secret-dir
mountPath: /home/jenkins/.m2/settings-security.xml
subPath: settings-security.xml
readOnly: true
- name: m2-secret-dir
mountPath: /home/jenkins/.m2/settings.xml
subPath: settings.xml
readOnly: true
- name: m2-dir
mountPath: /home/jenkins/.m2/toolchains.xml
subPath: toolchains.xml
readOnly: true
- name: m2-dir
mountPath: /home/jenkins/.mavenrc
subPath: .mavenrc
readOnly: true
volumes:
- name: m2-secret-dir
secret:
secretName: m2-secret-dir
- name: m2-dir
configMap:
name: m2-dir
inheritYamlMergeStrategy: "true"
yamlMergeStrategy: "merge"
- name: "ubuntu-2204"
namespace: "jakartaee-spec-committee"
label: "ubuntu-2204"
@@ -534,7 +261,7 @@ jenkins:
yamlMergeStrategy: "merge"
- name: "ubuntu-2404"
namespace: "jakartaee-spec-committee"
label: "ubuntu-latest ubuntu-2404"
label: "ubuntu-latest ubuntu-2404 migration jipp-migration centos-7 centos-8 centos-latest"
containers:
- name: "jnlp"
image: docker.io/eclipsecbi/jiro-agent-ubuntu-2404:remoting-3261.v9c670a_4748a_9
Original file line number Diff line number Diff line change
@@ -102,98 +102,7 @@ data:
templates:
- name: "basic"
namespace: "jakartaee-spec-committee"
label: "basic"
containers:
- name: "jnlp"
image: docker.io/eclipsecbi/jiro-agent-basic:remoting-3261.v9c670a_4748a_9
alwaysPullImage: true
livenessProbe:
failureThreshold: 0
initialDelaySeconds: 0
periodSeconds: 0
successThreshold: 0
timeoutSeconds: 0
ttyEnabled: true
command: ""
args: ""
instanceCap: -1
nodeUsageMode: EXCLUSIVE
envVars:
- envVar:
key: "JAVA_TOOL_OPTIONS"
value: ""
- envVar:
key: "JENKINS_REMOTING_JAVA_OPTS"
value: "-showversion -XshowSettings:vm -Xmx256m -Dorg.jenkinsci.remoting.engine.JnlpProtocol3.disabled=true -Dorg.jenkinsci.plugins.gitclient.CliGitAPIImpl.useSETSID=true"
- envVar:
key: "OPENJ9_JAVA_OPTIONS"
value: "-XX:+IgnoreUnrecognizedVMOptions -XX:+IdleTuningCompactOnIdle -XX:+IdleTuningGcOnIdle"
- envVar:
key: "_JAVA_OPTIONS"
value: ""
volumes:
- persistentVolumeClaim:
claimName: "tools-claim-jiro-jakartaee-spec-committee"
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: "basic-ubuntu"
namespace: "jakartaee-spec-committee"
label: "basic-ubuntu"
label: "basic basic-ubuntu"
containers:
- name: "jnlp"
image: docker.io/eclipsecbi/jiro-agent-basic-ubuntu:remoting-3261.v9c670a_4748a_9
@@ -282,188 +191,6 @@ data:
name: m2-dir
inheritYamlMergeStrategy: "true"
yamlMergeStrategy: "merge"
- name: "centos-7"
namespace: "jakartaee-spec-committee"
label: "migration jipp-migration centos-7"
containers:
- name: "jnlp"
image: docker.io/eclipsecbi/jiro-agent-centos-7:remoting-3261.v9c670a_4748a_9
alwaysPullImage: true
livenessProbe:
failureThreshold: 0
initialDelaySeconds: 0
periodSeconds: 0
successThreshold: 0
timeoutSeconds: 0
ttyEnabled: true
command: ""
args: ""
instanceCap: -1
nodeUsageMode: EXCLUSIVE
envVars:
- envVar:
key: "JAVA_TOOL_OPTIONS"
value: ""
- envVar:
key: "JENKINS_REMOTING_JAVA_OPTS"
value: "-showversion -XshowSettings:vm -Xmx256m -Dorg.jenkinsci.remoting.engine.JnlpProtocol3.disabled=true -Dorg.jenkinsci.plugins.gitclient.CliGitAPIImpl.useSETSID=true"
- envVar:
key: "OPENJ9_JAVA_OPTIONS"
value: "-XX:+IgnoreUnrecognizedVMOptions -XX:+IdleTuningCompactOnIdle -XX:+IdleTuningGcOnIdle"
- envVar:
key: "_JAVA_OPTIONS"
value: ""
volumes:
- persistentVolumeClaim:
claimName: "tools-claim-jiro-jakartaee-spec-committee"
mountPath: "/opt/tools"
readOnly: true
- configMapVolume:
configMapName: "known-hosts"
mountPath: "/home/jenkins/.ssh/"
subPath: "."
- emptyDirVolume:
memory: false
mountPath: "/home/jenkins/"
- emptyDirVolume:
memory: false
mountPath: "/home/jenkins/.m2/repository"
- emptyDirVolume:
memory: false
mountPath: "/home/jenkins/.m2/wrapper"
workspaceVolume:
emptyDirWorkspaceVolume:
memory: false
yaml: |
apiVersion: v1
kind: Pod
spec:
containers:
- name: jnlp
resources:
limits:
cpu: "2000m"
memory: "4096Mi"
requests:
cpu: "1000m"
memory: "4096Mi"
volumeMounts:
- name: m2-secret-dir
mountPath: /home/jenkins/.m2/settings-security.xml
subPath: settings-security.xml
readOnly: true
- name: m2-secret-dir
mountPath: /home/jenkins/.m2/settings.xml
subPath: settings.xml
readOnly: true
- name: m2-dir
mountPath: /home/jenkins/.m2/toolchains.xml
subPath: toolchains.xml
readOnly: true
- name: m2-dir
mountPath: /home/jenkins/.mavenrc
subPath: .mavenrc
readOnly: true
volumes:
- name: m2-secret-dir
secret:
secretName: m2-secret-dir
- name: m2-dir
configMap:
name: m2-dir
inheritYamlMergeStrategy: "true"
yamlMergeStrategy: "merge"
- name: "centos-8"
namespace: "jakartaee-spec-committee"
label: "centos-latest centos-8"
containers:
- name: "jnlp"
image: docker.io/eclipsecbi/jiro-agent-centos-8:remoting-3261.v9c670a_4748a_9
alwaysPullImage: true
livenessProbe:
failureThreshold: 0
initialDelaySeconds: 0
periodSeconds: 0
successThreshold: 0
timeoutSeconds: 0
ttyEnabled: true
command: ""
args: ""
instanceCap: -1
nodeUsageMode: EXCLUSIVE
envVars:
- envVar:
key: "JAVA_TOOL_OPTIONS"
value: ""
- envVar:
key: "JENKINS_REMOTING_JAVA_OPTS"
value: "-showversion -XshowSettings:vm -Xmx256m -Dorg.jenkinsci.remoting.engine.JnlpProtocol3.disabled=true -Dorg.jenkinsci.plugins.gitclient.CliGitAPIImpl.useSETSID=true"
- envVar:
key: "OPENJ9_JAVA_OPTIONS"
value: "-XX:+IgnoreUnrecognizedVMOptions -XX:+IdleTuningCompactOnIdle -XX:+IdleTuningGcOnIdle"
- envVar:
key: "_JAVA_OPTIONS"
value: ""
volumes:
- persistentVolumeClaim:
claimName: "tools-claim-jiro-jakartaee-spec-committee"
mountPath: "/opt/tools"
readOnly: true
- configMapVolume:
configMapName: "known-hosts"
mountPath: "/home/jenkins/.ssh/"
subPath: "."
- emptyDirVolume:
memory: false
mountPath: "/home/jenkins/"
- emptyDirVolume:
memory: false
mountPath: "/home/jenkins/.m2/repository"
- emptyDirVolume:
memory: false
mountPath: "/home/jenkins/.m2/wrapper"
workspaceVolume:
emptyDirWorkspaceVolume:
memory: false
yaml: |
apiVersion: v1
kind: Pod
spec:
containers:
- name: jnlp
resources:
limits:
cpu: "2000m"
memory: "4096Mi"
requests:
cpu: "1000m"
memory: "4096Mi"
volumeMounts:
- name: m2-secret-dir
mountPath: /home/jenkins/.m2/settings-security.xml
subPath: settings-security.xml
readOnly: true
- name: m2-secret-dir
mountPath: /home/jenkins/.m2/settings.xml
subPath: settings.xml
readOnly: true
- name: m2-dir
mountPath: /home/jenkins/.m2/toolchains.xml
subPath: toolchains.xml
readOnly: true
- name: m2-dir
mountPath: /home/jenkins/.mavenrc
subPath: .mavenrc
readOnly: true
volumes:
- name: m2-secret-dir
secret:
secretName: m2-secret-dir
- name: m2-dir
configMap:
name: m2-dir
inheritYamlMergeStrategy: "true"
yamlMergeStrategy: "merge"
- name: "ubuntu-2204"
namespace: "jakartaee-spec-committee"
label: "ubuntu-2204"
@@ -557,7 +284,7 @@ data:
yamlMergeStrategy: "merge"
- name: "ubuntu-2404"
namespace: "jakartaee-spec-committee"
label: "ubuntu-latest ubuntu-2404"
label: "ubuntu-latest ubuntu-2404 migration jipp-migration centos-7 centos-8 centos-latest"
containers:
- name: "jnlp"
image: docker.io/eclipsecbi/jiro-agent-ubuntu-2404:remoting-3261.v9c670a_4748a_9
Original file line number Diff line number Diff line change
@@ -51,7 +51,7 @@
"env": [
{
"name": "JAVA_OPTS",
"value": "-showversion -XshowSettings:vm -XX:+AlwaysPreTouch -XX:+ParallelRefProcEnabled -XX:+DisableExplicitGC -Duser.timezone=America/Toronto -Dhudson.footerURL=https://ci.eclipse.org -Dhudson.model.UsageStatistics.disabled=true -Dhudson.lifecycle=hudson.lifecycle.ExitLifecycle -Djenkins.model.Jenkins.exitCodeOnRestart=0 -Djenkins.model.Jenkins.slaveAgentPort=50000 -Djenkins.model.Jenkins.slaveAgentPortEnforce=true -Djenkins.slaves.JnlpSlaveAgentProtocol3.enabled=false -Djenkins.install.runSetupWizard=false -Djenkins.ui.refresh=true -Djenkins.security.ManagePermission=true -Dorg.jenkinsci.plugins.durabletask.BourneShellScript.HEARTBEAT_CHECK_INTERVAL=7200 -DexecutableWar.jetty.disableCustomSessionIdCookieName=false -DexecutableWar.jetty.sessionIdCookieName=JSESSIONID.jakartaee-spec-committee -Dcasc.jenkins.config=/etc/jenkins/jenkins.yaml -Dio.jenkins.plugins.casc.ConfigurationAsCode.initialDelay=5000 -Dorg.csanchez.jenkins.plugins.kubernetes.pipeline.PodTemplateStepExecution.defaultImage=docker.io/eclipsecbi/jiro-agent-basic:remoting-3261.v9c670a_4748a_9 -Dorg.csanchez.jenkins.plugins.kubernetes.PodTemplate.connectionTimeout=180 -Dkubernetes.websocket.ping.interval=30000"
"value": "-showversion -XshowSettings:vm -XX:+AlwaysPreTouch -XX:+ParallelRefProcEnabled -XX:+DisableExplicitGC -Duser.timezone=America/Toronto -Dhudson.footerURL=https://ci.eclipse.org -Dhudson.model.UsageStatistics.disabled=true -Dhudson.lifecycle=hudson.lifecycle.ExitLifecycle -Djenkins.model.Jenkins.exitCodeOnRestart=0 -Djenkins.model.Jenkins.slaveAgentPort=50000 -Djenkins.model.Jenkins.slaveAgentPortEnforce=true -Djenkins.slaves.JnlpSlaveAgentProtocol3.enabled=false -Djenkins.install.runSetupWizard=false -Djenkins.ui.refresh=true -Djenkins.security.ManagePermission=true -Dorg.jenkinsci.plugins.durabletask.BourneShellScript.HEARTBEAT_CHECK_INTERVAL=7200 -DexecutableWar.jetty.disableCustomSessionIdCookieName=false -DexecutableWar.jetty.sessionIdCookieName=JSESSIONID.jakartaee-spec-committee -Dcasc.jenkins.config=/etc/jenkins/jenkins.yaml -Dio.jenkins.plugins.casc.ConfigurationAsCode.initialDelay=5000 -Dorg.csanchez.jenkins.plugins.kubernetes.pipeline.PodTemplateStepExecution.defaultImage=docker.io/eclipsecbi/jiro-agent-basic-ubuntu:remoting-3261.v9c670a_4748a_9 -Dorg.csanchez.jenkins.plugins.kubernetes.PodTemplate.connectionTimeout=180 -Dkubernetes.websocket.ping.interval=30000"
},
{
"name": "JENKINS_OPTS",
298 changes: 8 additions & 290 deletions instances/foundation-internal.webdev/target/config.json

Large diffs are not rendered by default.

277 changes: 2 additions & 275 deletions instances/foundation-internal.webdev/target/jenkins/configuration.yml
Original file line number Diff line number Diff line change
@@ -89,98 +89,7 @@ jenkins:
templates:
- name: "basic"
namespace: "foundation-internal-webdev"
label: "basic"
containers:
- name: "jnlp"
image: docker.io/eclipsecbi/jiro-agent-basic:remoting-3261.v9c670a_4748a_9
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-webdev"
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: "basic-ubuntu"
namespace: "foundation-internal-webdev"
label: "basic-ubuntu"
label: "basic basic-ubuntu"
containers:
- name: "jnlp"
image: docker.io/eclipsecbi/jiro-agent-basic-ubuntu:remoting-3261.v9c670a_4748a_9
@@ -269,188 +178,6 @@ jenkins:
name: m2-dir
inheritYamlMergeStrategy: "true"
yamlMergeStrategy: "merge"
- name: "centos-7"
namespace: "foundation-internal-webdev"
label: "migration jipp-migration centos-7"
containers:
- name: "jnlp"
image: docker.io/eclipsecbi/jiro-agent-centos-7:remoting-3261.v9c670a_4748a_9
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-webdev"
mountPath: "/opt/tools"
readOnly: true
- configMapVolume:
configMapName: "known-hosts"
mountPath: "/home/jenkins/.ssh/"
subPath: "."
- emptyDirVolume:
memory: false
mountPath: "/home/jenkins/"
- emptyDirVolume:
memory: false
mountPath: "/home/jenkins/.m2/repository"
- emptyDirVolume:
memory: false
mountPath: "/home/jenkins/.m2/wrapper"
workspaceVolume:
emptyDirWorkspaceVolume:
memory: false
yaml: |
apiVersion: v1
kind: Pod
spec:
containers:
- name: jnlp
resources:
limits:
cpu: "2000m"
memory: "4096Mi"
requests:
cpu: "1000m"
memory: "4096Mi"
volumeMounts:
- name: m2-secret-dir
mountPath: /home/jenkins/.m2/settings-security.xml
subPath: settings-security.xml
readOnly: true
- name: m2-secret-dir
mountPath: /home/jenkins/.m2/settings.xml
subPath: settings.xml
readOnly: true
- name: m2-dir
mountPath: /home/jenkins/.m2/toolchains.xml
subPath: toolchains.xml
readOnly: true
- name: m2-dir
mountPath: /home/jenkins/.mavenrc
subPath: .mavenrc
readOnly: true
volumes:
- name: m2-secret-dir
secret:
secretName: m2-secret-dir
- name: m2-dir
configMap:
name: m2-dir
inheritYamlMergeStrategy: "true"
yamlMergeStrategy: "merge"
- name: "centos-8"
namespace: "foundation-internal-webdev"
label: "centos-latest centos-8"
containers:
- name: "jnlp"
image: docker.io/eclipsecbi/jiro-agent-centos-8:remoting-3261.v9c670a_4748a_9
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-webdev"
mountPath: "/opt/tools"
readOnly: true
- configMapVolume:
configMapName: "known-hosts"
mountPath: "/home/jenkins/.ssh/"
subPath: "."
- emptyDirVolume:
memory: false
mountPath: "/home/jenkins/"
- emptyDirVolume:
memory: false
mountPath: "/home/jenkins/.m2/repository"
- emptyDirVolume:
memory: false
mountPath: "/home/jenkins/.m2/wrapper"
workspaceVolume:
emptyDirWorkspaceVolume:
memory: false
yaml: |
apiVersion: v1
kind: Pod
spec:
containers:
- name: jnlp
resources:
limits:
cpu: "2000m"
memory: "4096Mi"
requests:
cpu: "1000m"
memory: "4096Mi"
volumeMounts:
- name: m2-secret-dir
mountPath: /home/jenkins/.m2/settings-security.xml
subPath: settings-security.xml
readOnly: true
- name: m2-secret-dir
mountPath: /home/jenkins/.m2/settings.xml
subPath: settings.xml
readOnly: true
- name: m2-dir
mountPath: /home/jenkins/.m2/toolchains.xml
subPath: toolchains.xml
readOnly: true
- name: m2-dir
mountPath: /home/jenkins/.mavenrc
subPath: .mavenrc
readOnly: true
volumes:
- name: m2-secret-dir
secret:
secretName: m2-secret-dir
- name: m2-dir
configMap:
name: m2-dir
inheritYamlMergeStrategy: "true"
yamlMergeStrategy: "merge"
- name: "ubuntu-2204"
namespace: "foundation-internal-webdev"
label: "ubuntu-2204"
@@ -544,7 +271,7 @@ jenkins:
yamlMergeStrategy: "merge"
- name: "ubuntu-2404"
namespace: "foundation-internal-webdev"
label: "ubuntu-latest ubuntu-2404"
label: "ubuntu-latest ubuntu-2404 migration jipp-migration centos-7 centos-8 centos-latest"
containers:
- name: "jnlp"
image: docker.io/eclipsecbi/jiro-agent-ubuntu-2404:remoting-3261.v9c670a_4748a_9
Original file line number Diff line number Diff line change
@@ -112,98 +112,7 @@ data:
templates:
- name: "basic"
namespace: "foundation-internal-webdev"
label: "basic"
containers:
- name: "jnlp"
image: docker.io/eclipsecbi/jiro-agent-basic:remoting-3261.v9c670a_4748a_9
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-webdev"
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: "basic-ubuntu"
namespace: "foundation-internal-webdev"
label: "basic-ubuntu"
label: "basic basic-ubuntu"
containers:
- name: "jnlp"
image: docker.io/eclipsecbi/jiro-agent-basic-ubuntu:remoting-3261.v9c670a_4748a_9
@@ -292,188 +201,6 @@ data:
name: m2-dir
inheritYamlMergeStrategy: "true"
yamlMergeStrategy: "merge"
- name: "centos-7"
namespace: "foundation-internal-webdev"
label: "migration jipp-migration centos-7"
containers:
- name: "jnlp"
image: docker.io/eclipsecbi/jiro-agent-centos-7:remoting-3261.v9c670a_4748a_9
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-webdev"
mountPath: "/opt/tools"
readOnly: true
- configMapVolume:
configMapName: "known-hosts"
mountPath: "/home/jenkins/.ssh/"
subPath: "."
- emptyDirVolume:
memory: false
mountPath: "/home/jenkins/"
- emptyDirVolume:
memory: false
mountPath: "/home/jenkins/.m2/repository"
- emptyDirVolume:
memory: false
mountPath: "/home/jenkins/.m2/wrapper"
workspaceVolume:
emptyDirWorkspaceVolume:
memory: false
yaml: |
apiVersion: v1
kind: Pod
spec:
containers:
- name: jnlp
resources:
limits:
cpu: "2000m"
memory: "4096Mi"
requests:
cpu: "1000m"
memory: "4096Mi"
volumeMounts:
- name: m2-secret-dir
mountPath: /home/jenkins/.m2/settings-security.xml
subPath: settings-security.xml
readOnly: true
- name: m2-secret-dir
mountPath: /home/jenkins/.m2/settings.xml
subPath: settings.xml
readOnly: true
- name: m2-dir
mountPath: /home/jenkins/.m2/toolchains.xml
subPath: toolchains.xml
readOnly: true
- name: m2-dir
mountPath: /home/jenkins/.mavenrc
subPath: .mavenrc
readOnly: true
volumes:
- name: m2-secret-dir
secret:
secretName: m2-secret-dir
- name: m2-dir
configMap:
name: m2-dir
inheritYamlMergeStrategy: "true"
yamlMergeStrategy: "merge"
- name: "centos-8"
namespace: "foundation-internal-webdev"
label: "centos-latest centos-8"
containers:
- name: "jnlp"
image: docker.io/eclipsecbi/jiro-agent-centos-8:remoting-3261.v9c670a_4748a_9
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-webdev"
mountPath: "/opt/tools"
readOnly: true
- configMapVolume:
configMapName: "known-hosts"
mountPath: "/home/jenkins/.ssh/"
subPath: "."
- emptyDirVolume:
memory: false
mountPath: "/home/jenkins/"
- emptyDirVolume:
memory: false
mountPath: "/home/jenkins/.m2/repository"
- emptyDirVolume:
memory: false
mountPath: "/home/jenkins/.m2/wrapper"
workspaceVolume:
emptyDirWorkspaceVolume:
memory: false
yaml: |
apiVersion: v1
kind: Pod
spec:
containers:
- name: jnlp
resources:
limits:
cpu: "2000m"
memory: "4096Mi"
requests:
cpu: "1000m"
memory: "4096Mi"
volumeMounts:
- name: m2-secret-dir
mountPath: /home/jenkins/.m2/settings-security.xml
subPath: settings-security.xml
readOnly: true
- name: m2-secret-dir
mountPath: /home/jenkins/.m2/settings.xml
subPath: settings.xml
readOnly: true
- name: m2-dir
mountPath: /home/jenkins/.m2/toolchains.xml
subPath: toolchains.xml
readOnly: true
- name: m2-dir
mountPath: /home/jenkins/.mavenrc
subPath: .mavenrc
readOnly: true
volumes:
- name: m2-secret-dir
secret:
secretName: m2-secret-dir
- name: m2-dir
configMap:
name: m2-dir
inheritYamlMergeStrategy: "true"
yamlMergeStrategy: "merge"
- name: "ubuntu-2204"
namespace: "foundation-internal-webdev"
label: "ubuntu-2204"
@@ -567,7 +294,7 @@ data:
yamlMergeStrategy: "merge"
- name: "ubuntu-2404"
namespace: "foundation-internal-webdev"
label: "ubuntu-latest ubuntu-2404"
label: "ubuntu-latest ubuntu-2404 migration jipp-migration centos-7 centos-8 centos-latest"
containers:
- name: "jnlp"
image: docker.io/eclipsecbi/jiro-agent-ubuntu-2404:remoting-3261.v9c670a_4748a_9
Original file line number Diff line number Diff line change
@@ -51,7 +51,7 @@
"env": [
{
"name": "JAVA_OPTS",
"value": "-showversion -XshowSettings:vm -XX:+AlwaysPreTouch -XX:+ParallelRefProcEnabled -XX:+DisableExplicitGC -Duser.timezone=America/Toronto -Dhudson.footerURL=https://foundation.eclipse.org -Dhudson.model.UsageStatistics.disabled=true -Dhudson.lifecycle=hudson.lifecycle.ExitLifecycle -Djenkins.model.Jenkins.exitCodeOnRestart=0 -Djenkins.model.Jenkins.slaveAgentPort=50000 -Djenkins.model.Jenkins.slaveAgentPortEnforce=true -Djenkins.slaves.JnlpSlaveAgentProtocol3.enabled=false -Djenkins.install.runSetupWizard=false -Djenkins.ui.refresh=true -Djenkins.security.ManagePermission=true -Dorg.jenkinsci.plugins.durabletask.BourneShellScript.HEARTBEAT_CHECK_INTERVAL=7200 -DexecutableWar.jetty.disableCustomSessionIdCookieName=false -DexecutableWar.jetty.sessionIdCookieName=JSESSIONID.webdev -Dcasc.jenkins.config=/etc/jenkins/jenkins.yaml -Dio.jenkins.plugins.casc.ConfigurationAsCode.initialDelay=5000 -Dorg.csanchez.jenkins.plugins.kubernetes.pipeline.PodTemplateStepExecution.defaultImage=docker.io/eclipsecbi/jiro-agent-basic:remoting-3261.v9c670a_4748a_9 -Dorg.csanchez.jenkins.plugins.kubernetes.PodTemplate.connectionTimeout=180 -Dkubernetes.websocket.ping.interval=30000"
"value": "-showversion -XshowSettings:vm -XX:+AlwaysPreTouch -XX:+ParallelRefProcEnabled -XX:+DisableExplicitGC -Duser.timezone=America/Toronto -Dhudson.footerURL=https://foundation.eclipse.org -Dhudson.model.UsageStatistics.disabled=true -Dhudson.lifecycle=hudson.lifecycle.ExitLifecycle -Djenkins.model.Jenkins.exitCodeOnRestart=0 -Djenkins.model.Jenkins.slaveAgentPort=50000 -Djenkins.model.Jenkins.slaveAgentPortEnforce=true -Djenkins.slaves.JnlpSlaveAgentProtocol3.enabled=false -Djenkins.install.runSetupWizard=false -Djenkins.ui.refresh=true -Djenkins.security.ManagePermission=true -Dorg.jenkinsci.plugins.durabletask.BourneShellScript.HEARTBEAT_CHECK_INTERVAL=7200 -DexecutableWar.jetty.disableCustomSessionIdCookieName=false -DexecutableWar.jetty.sessionIdCookieName=JSESSIONID.webdev -Dcasc.jenkins.config=/etc/jenkins/jenkins.yaml -Dio.jenkins.plugins.casc.ConfigurationAsCode.initialDelay=5000 -Dorg.csanchez.jenkins.plugins.kubernetes.pipeline.PodTemplateStepExecution.defaultImage=docker.io/eclipsecbi/jiro-agent-basic-ubuntu:remoting-3261.v9c670a_4748a_9 -Dorg.csanchez.jenkins.plugins.kubernetes.PodTemplate.connectionTimeout=180 -Dkubernetes.websocket.ping.interval=30000"
},
{
"name": "JENKINS_OPTS",
2 changes: 1 addition & 1 deletion instances/modeling.sirius/target/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM docker.io/eclipsecbi/jiro-master:2.462.3
FROM docker.io/eclipsecbi/jiro-master:2.479.2

EXPOSE 8080
EXPOSE 50000
1 change: 0 additions & 1 deletion instances/modeling.sirius/target/jenkins/plugins-list.txt
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
# GENERATED FILE - DO NOT EDIT
gerrit-trigger
lockable-resources
zentimestamp
124 changes: 62 additions & 62 deletions instances/modeling.sirius/target/jenkins/plugins.log
Original file line number Diff line number Diff line change
@@ -1,52 +1,51 @@
Resulting plugin list:
analysis-model-api 12.9.0
analysis-model-api 12.9.1
ant 511.v0a_a_1a_334f41b_
antisamy-markup-formatter 162.v0e6ec0fcfcf6
apache-httpcomponents-client-4-api 4.5.14-208.v438351942757
apache-httpcomponents-client-5-api 5.4-118.v199115451c4d
asm-api 9.7.1-95.v9f552033802a_
apache-httpcomponents-client-5-api 5.4-124.v31e2987e48f4
asm-api 9.7.1-97.v4cc844130d97
authentication-tokens 1.119.v50285141b_7e1
authorize-project 1.7.2
authorize-project 1.8.1
bootstrap5-api 5.3.3-1
bouncycastle-api 2.30.1.78.1-248.ve27176eb_46cb_
branch-api 2.1178.v969d9eb_c728e
branch-api 2.1200.v4b_a_3da_2eb_db_4
build-timeout 1.33
caffeine-api 3.1.8-133.v17b_1ff2e0599
checks-api 2.2.1
cloudbees-disk-usage-simple 203.v3f46a_7462b_1a_
cloudbees-folder 6.955.v81e2a_35c08d3
command-launcher 115.vd8b_301cc15d0
cloudbees-disk-usage-simple 232.v713eeed2e1f4
cloudbees-folder 6.959.v4ed5cc9e2dd4
command-launcher 116.vd85919c54a_d6
commons-lang3-api 3.17.0-84.vb_b_938040b_078
commons-text-api 1.12.0-129.v99a_50df237f7
config-file-provider 978.v8e85886ffdc4
configuration-as-code 1850.va_a_8c31d3158b_
credentials 1384.vf0a_2ed06f9c6
credentials-binding 681.vf91669a_32e45
config-file-provider 980.v88956a_a_5d6a_d
configuration-as-code 1897.v79281e066ea_7
credentials 1389.vd7a_b_f5fa_50a_2
credentials-binding 687.v619cb_15e923f
data-tables-api 2.1.8-1
display-url-api 2.204.vf6fddd8a_8b_e9
durable-task 577.v2a_8a_4b_7c0247
echarts-api 5.5.1-1
display-url-api 2.209.v582ed814ff2f
durable-task 581.v299a_5609d767
echarts-api 5.5.1-4
eddsa-api 0.3.0-4.v84c6f0f4969e
email-ext 1844.v3ea_a_b_842374a_
email-ext 1861.vdb_d991590994
extended-read-permission 53.v6499940139e5
external-monitor-job 215.v2e88e894db_f8
extra-columns 1.26
extra-columns 1.27
font-awesome-api 6.6.0-2
forensics-api 2.6.0
gerrit-trigger 2.41.1
ghprb 1.42.2
git 5.5.2
git-client 5.0.0
git-parameter 0.9.19
git 5.6.0
git-client 6.1.0
git-parameter 0.10.0
github 1.40.0
github-api 1.321-468.v6a_9f5f2d5a_7e
github-branch-source 1797.v86fdb_4d57d43
github-api 1.321-478.vc9ce627ce001
github-branch-source 1807.v50351eb_7dd13
gitlab-api 5.6.0-97.v6603a_83f8690
gitlab-branch-source 710.v6f19df32544b_
gitlab-plugin 1.8.1
gson-api 2.11.0-41.v019fcf6125dc
gitlab-branch-source 715.v4c830b_ca_ef95
gitlab-plugin 1.9.6
gson-api 2.11.0-85.v1f4e87273c33
handy-uri-templates-2-api 2.1.8-30.v7e777411b_148
hashicorp-vault-plugin 370.v946b_53544a_30
hashicorp-vault-plugin 371.v884a_4dd60fb_6
instance-identity 201.vd2a_b_5a_468a_a_6
ionicons-api 74.v93d5eb_813d5f
jackson2-api 2.17.0-379.v02de8ec9f64c
@@ -58,74 +57,75 @@ jaxb 2.3.9-1
jdk-tool 80.v8a_dee33ed6f0
jersey2-api 2.44-151.v6df377fff741
jjwt-api 0.11.5-112.ve82dfb_224b_a_d
jobConfigHistory 1268.v75ce751da_911
joda-time-api 2.13.0-85.vb_64d1c2921f1
jobConfigHistory 1283.veb_dfb_00b_5ec0
joda-time-api 2.13.0-93.v9934da_29b_a_e9
jquery3-api 3.7.1-2
jsch 0.2.16-86.v42e010d9484b_
json-api 20240303-41.v94e11e6de726
json-path-api 2.9.0-58.v62e3e85b_a_655
junit 1304.vc85a_b_ca_96613
kubernetes 4290.v93ea_4b_b_26a_61
json-api 20240303-101.v7a_8666713110
json-path-api 2.9.0-118.v7f23ed82a_8b_8
junit 1309.v0078b_fecd6ed
kubernetes 4296.v20a_7e4d77cf6
kubernetes-client-api 6.10.0-240.v57880ce8b_0b_2
kubernetes-credentials 190.v03c305394deb_
ldap 725.v3cb_b_711b_1a_ef
lockable-resources 1315.v4ea_8e5159ec8
mailer 488.v0c9639c1a_eb_3
matrix-auth 3.2.2
matrix-project 839.vff91cd7e3a_b_2
maven-plugin 3.23
metrics 4.2.21-451.vd51df8df52ec
ldap 770.vb_455e934581a_
lockable-resources 1327.ved786b_a_197e0
mailer 489.vd4b_25144138f
matrix-auth 3.2.3
matrix-project 840.v812f627cb_578
maven-plugin 3.24
metrics 4.2.21-458.vcf496cb_839e4
mina-sshd-api-common 2.14.0-133.vcc091215a_358
mina-sshd-api-core 2.14.0-133.vcc091215a_358
okhttp-api 4.11.0-172.vda_da_1feeb_c6e
okhttp-api 4.11.0-181.v1de5b_83857df
pam-auth 1.11
parameterized-trigger 806.vf6fff3e28c3e
pipeline-build-step 540.vb_e8849e1a_b_d8
pipeline-graph-analysis 216.vfd8b_ece330ca_
pipeline-groovy-lib 730.ve57b_34648c63
pipeline-graph-view 382.vb_9a_27b_7b_ea_71
pipeline-groovy-lib 744.v5b_556ee7c253
pipeline-input-step 495.ve9c153f6067b_
pipeline-maven 1457.vf7a_de13b_c0d4
pipeline-maven-api 1457.vf7a_de13b_c0d4
pipeline-maven 1469.ve15ca_a_b_90b_44
pipeline-maven-api 1469.ve15ca_a_b_90b_44
pipeline-milestone-step 119.vdfdc43fc3b_9a_
pipeline-model-api 2.2214.vb_b_34b_2ea_9b_83
pipeline-model-definition 2.2214.vb_b_34b_2ea_9b_83
pipeline-model-extensions 2.2214.vb_b_34b_2ea_9b_83
pipeline-model-api 2.2218.v56d0cda_37c72
pipeline-model-definition 2.2218.v56d0cda_37c72
pipeline-model-extensions 2.2218.v56d0cda_37c72
pipeline-rest-api 2.34
pipeline-stage-step 312.v8cd10304c27a_
pipeline-stage-tags-metadata 2.2214.vb_b_34b_2ea_9b_83
pipeline-stage-tags-metadata 2.2218.v56d0cda_37c72
pipeline-stage-view 2.34
plain-credentials 183.va_de8f1dd5a_2b_
plugin-util-api 5.1.0
prism-api 1.29.0-17
prometheus 787.v52e8f47488fc
prism-api 1.29.0-18
prometheus 795.v995762102f28
promoted-builds 965.vcda_c6a_e0998f
rebuild 332.va_1ee476d8f6d
resource-disposer 0.24
scm-api 696.v778d637b_a_762
script-security 1362.v67dc1f0e1b_b_3
resource-disposer 0.25
scm-api 698.v8e3b_c788f0a_6
script-security 1369.v9b_98a_4e95b_2d
simple-theme-plugin 196.v96d9592f4efa_
snakeyaml-api 2.3-123.v13484c65210a_
sonar 2.17.2
sonar 2.17.3
ssh-agent 376.v8933585c69d3
ssh-credentials 343.v884f71d78167
ssh-credentials 349.vb_8b_6b_9709f5b_
ssh-slaves 2.973.v0fa_8c0dea_f9f
structs 338.v848422169819
timestamper 1.27
timestamper 1.28
token-macro 400.v35420b_922dcb_
trilead-api 2.147.vb_73cc728a_32e
variant 60.v7290fc0eb_b_cd
warnings-ng 11.9.0
warnings-ng 11.12.0
workflow-aggregator 600.vb_57cdd26fdd7
workflow-api 1336.vee415d95c521
workflow-basic-steps 1058.vcb_fc1e3a_21a_9
workflow-cps 3969.vdc9d3a_efcc6a_
workflow-durable-task-step 1371.vb_7cec8f3b_95e
workflow-job 1436.vfa_244484591f
workflow-cps 3996.va_f5c1799f978
workflow-durable-task-step 1398.vf6c9e89e5988
workflow-job 1468.vcf4f5ee92395
workflow-multibranch 795.ve0cb_1f45ca_9a_
workflow-scm-step 427.v4ca_6512e7df1
workflow-step-api 678.v3ee58b_469476
workflow-support 926.v9f4f9b_b_98c19
ws-cleanup 0.47
workflow-support 936.v9fa_77211ca_e1
ws-cleanup 0.48
xvnc 1.28
zentimestamp 4.2

2 changes: 1 addition & 1 deletion instances/tools.cdt/target/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM docker.io/eclipsecbi/jiro-master:2.462.3
FROM docker.io/eclipsecbi/jiro-master:2.479.2

EXPOSE 8080
EXPOSE 50000
369 changes: 38 additions & 331 deletions instances/tools.cdt/target/config.json

Large diffs are not rendered by default.

287 changes: 7 additions & 280 deletions instances/tools.cdt/target/jenkins/configuration.yml
Original file line number Diff line number Diff line change
@@ -79,10 +79,10 @@ jenkins:
templates:
- name: "basic"
namespace: "cdt"
label: "basic"
label: "basic basic-ubuntu"
containers:
- name: "jnlp"
image: docker.io/eclipsecbi/jiro-agent-basic:remoting-3248.3250.v3277a_8e88c9b_
image: docker.io/eclipsecbi/jiro-agent-basic-ubuntu:remoting-3261.v9c670a_4748a_9
alwaysPullImage: true
livenessProbe:
failureThreshold: 0
@@ -168,285 +168,12 @@ jenkins:
name: m2-dir
inheritYamlMergeStrategy: "true"
yamlMergeStrategy: "merge"
- name: "basic-ubuntu"
namespace: "cdt"
label: "basic-ubuntu"
containers:
- name: "jnlp"
image: docker.io/eclipsecbi/jiro-agent-basic-ubuntu:remoting-3248.3250.v3277a_8e88c9b_
alwaysPullImage: true
livenessProbe:
failureThreshold: 0
initialDelaySeconds: 0
periodSeconds: 0
successThreshold: 0
timeoutSeconds: 0
ttyEnabled: true
command: ""
args: ""
instanceCap: -1
nodeUsageMode: EXCLUSIVE
envVars:
- envVar:
key: "JAVA_TOOL_OPTIONS"
value: ""
- envVar:
key: "JENKINS_REMOTING_JAVA_OPTS"
value: "-showversion -XshowSettings:vm -Xmx256m -Dorg.jenkinsci.remoting.engine.JnlpProtocol3.disabled=true -Dorg.jenkinsci.plugins.gitclient.CliGitAPIImpl.useSETSID=true"
- envVar:
key: "OPENJ9_JAVA_OPTIONS"
value: "-XX:+IgnoreUnrecognizedVMOptions -XX:+IdleTuningCompactOnIdle -XX:+IdleTuningGcOnIdle"
- envVar:
key: "_JAVA_OPTIONS"
value: ""
volumes:
- persistentVolumeClaim:
claimName: "tools-claim-jiro-cdt"
mountPath: "/opt/tools"
readOnly: true
- configMapVolume:
configMapName: "known-hosts"
mountPath: "/home/jenkins/.ssh/"
subPath: "."
- emptyDirVolume:
memory: false
mountPath: "/home/jenkins/"
- emptyDirVolume:
memory: false
mountPath: "/home/jenkins/.m2/repository"
- emptyDirVolume:
memory: false
mountPath: "/home/jenkins/.m2/wrapper"
workspaceVolume:
emptyDirWorkspaceVolume:
memory: false
yaml: |
apiVersion: v1
kind: Pod
spec:
containers:
- name: jnlp
resources:
limits:
cpu: "2000m"
memory: "4096Mi"
requests:
cpu: "1000m"
memory: "4096Mi"
volumeMounts:
- name: m2-secret-dir
mountPath: /home/jenkins/.m2/settings-security.xml
subPath: settings-security.xml
readOnly: true
- name: m2-secret-dir
mountPath: /home/jenkins/.m2/settings.xml
subPath: settings.xml
readOnly: true
- name: m2-dir
mountPath: /home/jenkins/.m2/toolchains.xml
subPath: toolchains.xml
readOnly: true
- name: m2-dir
mountPath: /home/jenkins/.mavenrc
subPath: .mavenrc
readOnly: true
volumes:
- name: m2-secret-dir
secret:
secretName: m2-secret-dir
- name: m2-dir
configMap:
name: m2-dir
inheritYamlMergeStrategy: "true"
yamlMergeStrategy: "merge"
- name: "centos-7"
namespace: "cdt"
label: "migration jipp-migration centos-7"
containers:
- name: "jnlp"
image: docker.io/eclipsecbi/jiro-agent-centos-7:remoting-3248.3250.v3277a_8e88c9b_
alwaysPullImage: true
livenessProbe:
failureThreshold: 0
initialDelaySeconds: 0
periodSeconds: 0
successThreshold: 0
timeoutSeconds: 0
ttyEnabled: true
command: ""
args: ""
instanceCap: -1
nodeUsageMode: EXCLUSIVE
envVars:
- envVar:
key: "JAVA_TOOL_OPTIONS"
value: ""
- envVar:
key: "JENKINS_REMOTING_JAVA_OPTS"
value: "-showversion -XshowSettings:vm -Xmx256m -Dorg.jenkinsci.remoting.engine.JnlpProtocol3.disabled=true -Dorg.jenkinsci.plugins.gitclient.CliGitAPIImpl.useSETSID=true"
- envVar:
key: "OPENJ9_JAVA_OPTIONS"
value: "-XX:+IgnoreUnrecognizedVMOptions -XX:+IdleTuningCompactOnIdle -XX:+IdleTuningGcOnIdle"
- envVar:
key: "_JAVA_OPTIONS"
value: ""
volumes:
- persistentVolumeClaim:
claimName: "tools-claim-jiro-cdt"
mountPath: "/opt/tools"
readOnly: true
- configMapVolume:
configMapName: "known-hosts"
mountPath: "/home/jenkins/.ssh/"
subPath: "."
- emptyDirVolume:
memory: false
mountPath: "/home/jenkins/"
- emptyDirVolume:
memory: false
mountPath: "/home/jenkins/.m2/repository"
- emptyDirVolume:
memory: false
mountPath: "/home/jenkins/.m2/wrapper"
workspaceVolume:
emptyDirWorkspaceVolume:
memory: false
yaml: |
apiVersion: v1
kind: Pod
spec:
containers:
- name: jnlp
resources:
limits:
cpu: "2000m"
memory: "4096Mi"
requests:
cpu: "1000m"
memory: "4096Mi"
volumeMounts:
- name: m2-secret-dir
mountPath: /home/jenkins/.m2/settings-security.xml
subPath: settings-security.xml
readOnly: true
- name: m2-secret-dir
mountPath: /home/jenkins/.m2/settings.xml
subPath: settings.xml
readOnly: true
- name: m2-dir
mountPath: /home/jenkins/.m2/toolchains.xml
subPath: toolchains.xml
readOnly: true
- name: m2-dir
mountPath: /home/jenkins/.mavenrc
subPath: .mavenrc
readOnly: true
volumes:
- name: m2-secret-dir
secret:
secretName: m2-secret-dir
- name: m2-dir
configMap:
name: m2-dir
inheritYamlMergeStrategy: "true"
yamlMergeStrategy: "merge"
- name: "centos-8"
namespace: "cdt"
label: "centos-latest centos-8"
containers:
- name: "jnlp"
image: docker.io/eclipsecbi/jiro-agent-centos-8:remoting-3248.3250.v3277a_8e88c9b_
alwaysPullImage: true
livenessProbe:
failureThreshold: 0
initialDelaySeconds: 0
periodSeconds: 0
successThreshold: 0
timeoutSeconds: 0
ttyEnabled: true
command: ""
args: ""
instanceCap: -1
nodeUsageMode: EXCLUSIVE
envVars:
- envVar:
key: "JAVA_TOOL_OPTIONS"
value: ""
- envVar:
key: "JENKINS_REMOTING_JAVA_OPTS"
value: "-showversion -XshowSettings:vm -Xmx256m -Dorg.jenkinsci.remoting.engine.JnlpProtocol3.disabled=true -Dorg.jenkinsci.plugins.gitclient.CliGitAPIImpl.useSETSID=true"
- envVar:
key: "OPENJ9_JAVA_OPTIONS"
value: "-XX:+IgnoreUnrecognizedVMOptions -XX:+IdleTuningCompactOnIdle -XX:+IdleTuningGcOnIdle"
- envVar:
key: "_JAVA_OPTIONS"
value: ""
volumes:
- persistentVolumeClaim:
claimName: "tools-claim-jiro-cdt"
mountPath: "/opt/tools"
readOnly: true
- configMapVolume:
configMapName: "known-hosts"
mountPath: "/home/jenkins/.ssh/"
subPath: "."
- emptyDirVolume:
memory: false
mountPath: "/home/jenkins/"
- emptyDirVolume:
memory: false
mountPath: "/home/jenkins/.m2/repository"
- emptyDirVolume:
memory: false
mountPath: "/home/jenkins/.m2/wrapper"
workspaceVolume:
emptyDirWorkspaceVolume:
memory: false
yaml: |
apiVersion: v1
kind: Pod
spec:
containers:
- name: jnlp
resources:
limits:
cpu: "2000m"
memory: "4096Mi"
requests:
cpu: "1000m"
memory: "4096Mi"
volumeMounts:
- name: m2-secret-dir
mountPath: /home/jenkins/.m2/settings-security.xml
subPath: settings-security.xml
readOnly: true
- name: m2-secret-dir
mountPath: /home/jenkins/.m2/settings.xml
subPath: settings.xml
readOnly: true
- name: m2-dir
mountPath: /home/jenkins/.m2/toolchains.xml
subPath: toolchains.xml
readOnly: true
- name: m2-dir
mountPath: /home/jenkins/.mavenrc
subPath: .mavenrc
readOnly: true
volumes:
- name: m2-secret-dir
secret:
secretName: m2-secret-dir
- name: m2-dir
configMap:
name: m2-dir
inheritYamlMergeStrategy: "true"
yamlMergeStrategy: "merge"
- name: "ubuntu-2204"
namespace: "cdt"
label: "ubuntu-2204"
containers:
- name: "jnlp"
image: docker.io/eclipsecbi/jiro-agent-ubuntu-2204:remoting-3248.3250.v3277a_8e88c9b_
image: docker.io/eclipsecbi/jiro-agent-ubuntu-2204:remoting-3261.v9c670a_4748a_9
alwaysPullImage: true
livenessProbe:
failureThreshold: 0
@@ -534,10 +261,10 @@ jenkins:
yamlMergeStrategy: "merge"
- name: "ubuntu-2404"
namespace: "cdt"
label: "ubuntu-latest ubuntu-2404"
label: "ubuntu-latest ubuntu-2404 migration jipp-migration centos-7 centos-8 centos-latest"
containers:
- name: "jnlp"
image: docker.io/eclipsecbi/jiro-agent-ubuntu-2404:remoting-3248.3250.v3277a_8e88c9b_
image: docker.io/eclipsecbi/jiro-agent-ubuntu-2404:remoting-3261.v9c670a_4748a_9
alwaysPullImage: true
livenessProbe:
failureThreshold: 0
@@ -717,7 +444,7 @@ unclassified:
createAccountBasedOnEmail: true
useExistingAccountWithSameEmail: true
jobConfigHistory:
excludePattern: "queue\\.xml|nodeMonitors\\.xml|UpdateCenter\\.xml|global-build-stats|LockableResourcesManager\\.xml|MilestoneStep\\.xml"
excludePattern: "queue\\.xml|nodeMonitors\\.xml|UpdateCenter\\.xml|global-build-stats|LockableResourcesManager\\.xml|MilestoneStep\\.xml|hudson.plugins.xvnc.Xvnc\\.xml"
maxDaysToKeepEntries: "60"
maxEntriesPerPage: "12"
maxHistoryEntries: "500"
@@ -865,7 +592,7 @@ tool:
- installSource:
installers:
- antFromApache:
id: "1.10.12"
id: "1.10.15"
maven:
installations:
- name: "apache-maven-latest"
123 changes: 62 additions & 61 deletions instances/tools.cdt/target/jenkins/plugins.log
Original file line number Diff line number Diff line change
@@ -1,51 +1,51 @@
Resulting plugin list:
analysis-model-api 12.9.0
analysis-model-api 12.9.1
ant 511.v0a_a_1a_334f41b_
antisamy-markup-formatter 162.v0e6ec0fcfcf6
apache-httpcomponents-client-4-api 4.5.14-208.v438351942757
apache-httpcomponents-client-5-api 5.4-118.v199115451c4d
asm-api 9.7.1-95.v9f552033802a_
apache-httpcomponents-client-5-api 5.4-124.v31e2987e48f4
asm-api 9.7.1-97.v4cc844130d97
authentication-tokens 1.119.v50285141b_7e1
authorize-project 1.7.2
authorize-project 1.8.1
bootstrap5-api 5.3.3-1
bouncycastle-api 2.30.1.78.1-248.ve27176eb_46cb_
branch-api 2.1178.v969d9eb_c728e
branch-api 2.1200.v4b_a_3da_2eb_db_4
build-timeout 1.33
caffeine-api 3.1.8-133.v17b_1ff2e0599
checks-api 2.2.1
cloudbees-disk-usage-simple 203.v3f46a_7462b_1a_
cloudbees-folder 6.955.v81e2a_35c08d3
command-launcher 115.vd8b_301cc15d0
cloudbees-disk-usage-simple 232.v713eeed2e1f4
cloudbees-folder 6.959.v4ed5cc9e2dd4
command-launcher 116.vd85919c54a_d6
commons-lang3-api 3.17.0-84.vb_b_938040b_078
commons-text-api 1.12.0-129.v99a_50df237f7
config-file-provider 978.v8e85886ffdc4
configuration-as-code 1850.va_a_8c31d3158b_
credentials 1384.vf0a_2ed06f9c6
credentials-binding 681.vf91669a_32e45
config-file-provider 980.v88956a_a_5d6a_d
configuration-as-code 1897.v79281e066ea_7
credentials 1389.vd7a_b_f5fa_50a_2
credentials-binding 687.v619cb_15e923f
data-tables-api 2.1.8-1
display-url-api 2.204.vf6fddd8a_8b_e9
durable-task 577.v2a_8a_4b_7c0247
echarts-api 5.5.1-1
display-url-api 2.209.v582ed814ff2f
durable-task 581.v299a_5609d767
echarts-api 5.5.1-4
eddsa-api 0.3.0-4.v84c6f0f4969e
email-ext 1844.v3ea_a_b_842374a_
email-ext 1861.vdb_d991590994
extended-read-permission 53.v6499940139e5
external-monitor-job 215.v2e88e894db_f8
extra-columns 1.26
extra-columns 1.27
font-awesome-api 6.6.0-2
forensics-api 2.6.0
ghprb 1.42.2
git 5.5.2
git-client 5.0.0
git-parameter 0.9.19
git 5.6.0
git-client 6.1.0
git-parameter 0.10.0
github 1.40.0
github-api 1.321-468.v6a_9f5f2d5a_7e
github-branch-source 1797.v86fdb_4d57d43
github-api 1.321-478.vc9ce627ce001
github-branch-source 1807.v50351eb_7dd13
gitlab-api 5.6.0-97.v6603a_83f8690
gitlab-branch-source 710.v6f19df32544b_
gitlab-plugin 1.8.1
gson-api 2.11.0-41.v019fcf6125dc
gitlab-branch-source 715.v4c830b_ca_ef95
gitlab-plugin 1.9.6
gson-api 2.11.0-85.v1f4e87273c33
handy-uri-templates-2-api 2.1.8-30.v7e777411b_148
hashicorp-vault-plugin 370.v946b_53544a_30
hashicorp-vault-plugin 371.v884a_4dd60fb_6
instance-identity 201.vd2a_b_5a_468a_a_6
ionicons-api 74.v93d5eb_813d5f
jackson2-api 2.17.0-379.v02de8ec9f64c
@@ -57,75 +57,76 @@ jaxb 2.3.9-1
jdk-tool 80.v8a_dee33ed6f0
jersey2-api 2.44-151.v6df377fff741
jjwt-api 0.11.5-112.ve82dfb_224b_a_d
jobConfigHistory 1268.v75ce751da_911
joda-time-api 2.13.0-85.vb_64d1c2921f1
jobConfigHistory 1283.veb_dfb_00b_5ec0
joda-time-api 2.13.0-93.v9934da_29b_a_e9
jquery3-api 3.7.1-2
jsch 0.2.16-86.v42e010d9484b_
json-api 20240303-41.v94e11e6de726
json-path-api 2.9.0-58.v62e3e85b_a_655
junit 1304.vc85a_b_ca_96613
kubernetes 4290.v93ea_4b_b_26a_61
json-api 20240303-101.v7a_8666713110
json-path-api 2.9.0-118.v7f23ed82a_8b_8
junit 1309.v0078b_fecd6ed
kubernetes 4296.v20a_7e4d77cf6
kubernetes-client-api 6.10.0-240.v57880ce8b_0b_2
kubernetes-credentials 190.v03c305394deb_
ldap 725.v3cb_b_711b_1a_ef
mailer 488.v0c9639c1a_eb_3
matrix-auth 3.2.2
matrix-project 839.vff91cd7e3a_b_2
maven-plugin 3.23
metrics 4.2.21-451.vd51df8df52ec
ldap 770.vb_455e934581a_
mailer 489.vd4b_25144138f
matrix-auth 3.2.3
matrix-project 840.v812f627cb_578
maven-plugin 3.24
metrics 4.2.21-458.vcf496cb_839e4
mina-sshd-api-common 2.14.0-133.vcc091215a_358
mina-sshd-api-core 2.14.0-133.vcc091215a_358
nodejs 1.6.2
okhttp-api 4.11.0-172.vda_da_1feeb_c6e
okhttp-api 4.11.0-181.v1de5b_83857df
pam-auth 1.11
parameterized-trigger 806.vf6fff3e28c3e
pipeline-build-step 540.vb_e8849e1a_b_d8
pipeline-github 2.8-159.09e4403bc62f
pipeline-graph-analysis 216.vfd8b_ece330ca_
pipeline-groovy-lib 730.ve57b_34648c63
pipeline-graph-view 382.vb_9a_27b_7b_ea_71
pipeline-groovy-lib 744.v5b_556ee7c253
pipeline-input-step 495.ve9c153f6067b_
pipeline-maven 1457.vf7a_de13b_c0d4
pipeline-maven-api 1457.vf7a_de13b_c0d4
pipeline-maven 1469.ve15ca_a_b_90b_44
pipeline-maven-api 1469.ve15ca_a_b_90b_44
pipeline-milestone-step 119.vdfdc43fc3b_9a_
pipeline-model-api 2.2214.vb_b_34b_2ea_9b_83
pipeline-model-definition 2.2214.vb_b_34b_2ea_9b_83
pipeline-model-extensions 2.2214.vb_b_34b_2ea_9b_83
pipeline-model-api 2.2218.v56d0cda_37c72
pipeline-model-definition 2.2218.v56d0cda_37c72
pipeline-model-extensions 2.2218.v56d0cda_37c72
pipeline-rest-api 2.34
pipeline-stage-step 312.v8cd10304c27a_
pipeline-stage-tags-metadata 2.2214.vb_b_34b_2ea_9b_83
pipeline-stage-tags-metadata 2.2218.v56d0cda_37c72
pipeline-stage-view 2.34
plain-credentials 183.va_de8f1dd5a_2b_
plugin-util-api 5.1.0
prism-api 1.29.0-17
prometheus 787.v52e8f47488fc
prism-api 1.29.0-18
prometheus 795.v995762102f28
promoted-builds 965.vcda_c6a_e0998f
rebuild 332.va_1ee476d8f6d
resource-disposer 0.24
scm-api 696.v778d637b_a_762
script-security 1362.v67dc1f0e1b_b_3
resource-disposer 0.25
scm-api 698.v8e3b_c788f0a_6
script-security 1369.v9b_98a_4e95b_2d
simple-theme-plugin 196.v96d9592f4efa_
snakeyaml-api 2.3-123.v13484c65210a_
sonar 2.17.2
sonar 2.17.3
ssh-agent 376.v8933585c69d3
ssh-credentials 343.v884f71d78167
ssh-credentials 349.vb_8b_6b_9709f5b_
ssh-slaves 2.973.v0fa_8c0dea_f9f
structs 338.v848422169819
throttle-concurrents 2.14
timestamper 1.27
throttle-concurrents 2.16
timestamper 1.28
token-macro 400.v35420b_922dcb_
trilead-api 2.147.vb_73cc728a_32e
variant 60.v7290fc0eb_b_cd
warnings-ng 11.9.0
warnings-ng 11.12.0
workflow-aggregator 600.vb_57cdd26fdd7
workflow-api 1336.vee415d95c521
workflow-basic-steps 1058.vcb_fc1e3a_21a_9
workflow-cps 3969.vdc9d3a_efcc6a_
workflow-durable-task-step 1371.vb_7cec8f3b_95e
workflow-job 1436.vfa_244484591f
workflow-cps 3996.va_f5c1799f978
workflow-durable-task-step 1398.vf6c9e89e5988
workflow-job 1468.vcf4f5ee92395
workflow-multibranch 795.ve0cb_1f45ca_9a_
workflow-scm-step 427.v4ca_6512e7df1
workflow-step-api 678.v3ee58b_469476
workflow-support 926.v9f4f9b_b_98c19
ws-cleanup 0.47
workflow-support 936.v9fa_77211ca_e1
ws-cleanup 0.48
xvnc 1.28

289 changes: 8 additions & 281 deletions instances/tools.cdt/target/k8s/configmap-jenkins-config.yml
Original file line number Diff line number Diff line change
@@ -15,7 +15,7 @@ metadata:
org.eclipse.cbi.jiro/kind: "master"
annotations:
org.eclipse.cbi.jiro/jenkins.version: "latest"
org.eclipse.cbi.jiro/jenkins.actualVersion: "2.462.3"
org.eclipse.cbi.jiro/jenkins.actualVersion: "2.479.2"
org.eclipse.cbi.jiro/kubernetes.master.namespace: "cdt"
namespace: "cdt"
name: jenkins-config
@@ -102,10 +102,10 @@ data:
templates:
- name: "basic"
namespace: "cdt"
label: "basic"
label: "basic basic-ubuntu"
containers:
- name: "jnlp"
image: docker.io/eclipsecbi/jiro-agent-basic:remoting-3248.3250.v3277a_8e88c9b_
image: docker.io/eclipsecbi/jiro-agent-basic-ubuntu:remoting-3261.v9c670a_4748a_9
alwaysPullImage: true
livenessProbe:
failureThreshold: 0
@@ -191,285 +191,12 @@ data:
name: m2-dir
inheritYamlMergeStrategy: "true"
yamlMergeStrategy: "merge"
- name: "basic-ubuntu"
namespace: "cdt"
label: "basic-ubuntu"
containers:
- name: "jnlp"
image: docker.io/eclipsecbi/jiro-agent-basic-ubuntu:remoting-3248.3250.v3277a_8e88c9b_
alwaysPullImage: true
livenessProbe:
failureThreshold: 0
initialDelaySeconds: 0
periodSeconds: 0
successThreshold: 0
timeoutSeconds: 0
ttyEnabled: true
command: ""
args: ""
instanceCap: -1
nodeUsageMode: EXCLUSIVE
envVars:
- envVar:
key: "JAVA_TOOL_OPTIONS"
value: ""
- envVar:
key: "JENKINS_REMOTING_JAVA_OPTS"
value: "-showversion -XshowSettings:vm -Xmx256m -Dorg.jenkinsci.remoting.engine.JnlpProtocol3.disabled=true -Dorg.jenkinsci.plugins.gitclient.CliGitAPIImpl.useSETSID=true"
- envVar:
key: "OPENJ9_JAVA_OPTIONS"
value: "-XX:+IgnoreUnrecognizedVMOptions -XX:+IdleTuningCompactOnIdle -XX:+IdleTuningGcOnIdle"
- envVar:
key: "_JAVA_OPTIONS"
value: ""
volumes:
- persistentVolumeClaim:
claimName: "tools-claim-jiro-cdt"
mountPath: "/opt/tools"
readOnly: true
- configMapVolume:
configMapName: "known-hosts"
mountPath: "/home/jenkins/.ssh/"
subPath: "."
- emptyDirVolume:
memory: false
mountPath: "/home/jenkins/"
- emptyDirVolume:
memory: false
mountPath: "/home/jenkins/.m2/repository"
- emptyDirVolume:
memory: false
mountPath: "/home/jenkins/.m2/wrapper"
workspaceVolume:
emptyDirWorkspaceVolume:
memory: false
yaml: |
apiVersion: v1
kind: Pod
spec:
containers:
- name: jnlp
resources:
limits:
cpu: "2000m"
memory: "4096Mi"
requests:
cpu: "1000m"
memory: "4096Mi"
volumeMounts:
- name: m2-secret-dir
mountPath: /home/jenkins/.m2/settings-security.xml
subPath: settings-security.xml
readOnly: true
- name: m2-secret-dir
mountPath: /home/jenkins/.m2/settings.xml
subPath: settings.xml
readOnly: true
- name: m2-dir
mountPath: /home/jenkins/.m2/toolchains.xml
subPath: toolchains.xml
readOnly: true
- name: m2-dir
mountPath: /home/jenkins/.mavenrc
subPath: .mavenrc
readOnly: true
volumes:
- name: m2-secret-dir
secret:
secretName: m2-secret-dir
- name: m2-dir
configMap:
name: m2-dir
inheritYamlMergeStrategy: "true"
yamlMergeStrategy: "merge"
- name: "centos-7"
namespace: "cdt"
label: "migration jipp-migration centos-7"
containers:
- name: "jnlp"
image: docker.io/eclipsecbi/jiro-agent-centos-7:remoting-3248.3250.v3277a_8e88c9b_
alwaysPullImage: true
livenessProbe:
failureThreshold: 0
initialDelaySeconds: 0
periodSeconds: 0
successThreshold: 0
timeoutSeconds: 0
ttyEnabled: true
command: ""
args: ""
instanceCap: -1
nodeUsageMode: EXCLUSIVE
envVars:
- envVar:
key: "JAVA_TOOL_OPTIONS"
value: ""
- envVar:
key: "JENKINS_REMOTING_JAVA_OPTS"
value: "-showversion -XshowSettings:vm -Xmx256m -Dorg.jenkinsci.remoting.engine.JnlpProtocol3.disabled=true -Dorg.jenkinsci.plugins.gitclient.CliGitAPIImpl.useSETSID=true"
- envVar:
key: "OPENJ9_JAVA_OPTIONS"
value: "-XX:+IgnoreUnrecognizedVMOptions -XX:+IdleTuningCompactOnIdle -XX:+IdleTuningGcOnIdle"
- envVar:
key: "_JAVA_OPTIONS"
value: ""
volumes:
- persistentVolumeClaim:
claimName: "tools-claim-jiro-cdt"
mountPath: "/opt/tools"
readOnly: true
- configMapVolume:
configMapName: "known-hosts"
mountPath: "/home/jenkins/.ssh/"
subPath: "."
- emptyDirVolume:
memory: false
mountPath: "/home/jenkins/"
- emptyDirVolume:
memory: false
mountPath: "/home/jenkins/.m2/repository"
- emptyDirVolume:
memory: false
mountPath: "/home/jenkins/.m2/wrapper"
workspaceVolume:
emptyDirWorkspaceVolume:
memory: false
yaml: |
apiVersion: v1
kind: Pod
spec:
containers:
- name: jnlp
resources:
limits:
cpu: "2000m"
memory: "4096Mi"
requests:
cpu: "1000m"
memory: "4096Mi"
volumeMounts:
- name: m2-secret-dir
mountPath: /home/jenkins/.m2/settings-security.xml
subPath: settings-security.xml
readOnly: true
- name: m2-secret-dir
mountPath: /home/jenkins/.m2/settings.xml
subPath: settings.xml
readOnly: true
- name: m2-dir
mountPath: /home/jenkins/.m2/toolchains.xml
subPath: toolchains.xml
readOnly: true
- name: m2-dir
mountPath: /home/jenkins/.mavenrc
subPath: .mavenrc
readOnly: true
volumes:
- name: m2-secret-dir
secret:
secretName: m2-secret-dir
- name: m2-dir
configMap:
name: m2-dir
inheritYamlMergeStrategy: "true"
yamlMergeStrategy: "merge"
- name: "centos-8"
namespace: "cdt"
label: "centos-latest centos-8"
containers:
- name: "jnlp"
image: docker.io/eclipsecbi/jiro-agent-centos-8:remoting-3248.3250.v3277a_8e88c9b_
alwaysPullImage: true
livenessProbe:
failureThreshold: 0
initialDelaySeconds: 0
periodSeconds: 0
successThreshold: 0
timeoutSeconds: 0
ttyEnabled: true
command: ""
args: ""
instanceCap: -1
nodeUsageMode: EXCLUSIVE
envVars:
- envVar:
key: "JAVA_TOOL_OPTIONS"
value: ""
- envVar:
key: "JENKINS_REMOTING_JAVA_OPTS"
value: "-showversion -XshowSettings:vm -Xmx256m -Dorg.jenkinsci.remoting.engine.JnlpProtocol3.disabled=true -Dorg.jenkinsci.plugins.gitclient.CliGitAPIImpl.useSETSID=true"
- envVar:
key: "OPENJ9_JAVA_OPTIONS"
value: "-XX:+IgnoreUnrecognizedVMOptions -XX:+IdleTuningCompactOnIdle -XX:+IdleTuningGcOnIdle"
- envVar:
key: "_JAVA_OPTIONS"
value: ""
volumes:
- persistentVolumeClaim:
claimName: "tools-claim-jiro-cdt"
mountPath: "/opt/tools"
readOnly: true
- configMapVolume:
configMapName: "known-hosts"
mountPath: "/home/jenkins/.ssh/"
subPath: "."
- emptyDirVolume:
memory: false
mountPath: "/home/jenkins/"
- emptyDirVolume:
memory: false
mountPath: "/home/jenkins/.m2/repository"
- emptyDirVolume:
memory: false
mountPath: "/home/jenkins/.m2/wrapper"
workspaceVolume:
emptyDirWorkspaceVolume:
memory: false
yaml: |
apiVersion: v1
kind: Pod
spec:
containers:
- name: jnlp
resources:
limits:
cpu: "2000m"
memory: "4096Mi"
requests:
cpu: "1000m"
memory: "4096Mi"
volumeMounts:
- name: m2-secret-dir
mountPath: /home/jenkins/.m2/settings-security.xml
subPath: settings-security.xml
readOnly: true
- name: m2-secret-dir
mountPath: /home/jenkins/.m2/settings.xml
subPath: settings.xml
readOnly: true
- name: m2-dir
mountPath: /home/jenkins/.m2/toolchains.xml
subPath: toolchains.xml
readOnly: true
- name: m2-dir
mountPath: /home/jenkins/.mavenrc
subPath: .mavenrc
readOnly: true
volumes:
- name: m2-secret-dir
secret:
secretName: m2-secret-dir
- name: m2-dir
configMap:
name: m2-dir
inheritYamlMergeStrategy: "true"
yamlMergeStrategy: "merge"
- name: "ubuntu-2204"
namespace: "cdt"
label: "ubuntu-2204"
containers:
- name: "jnlp"
image: docker.io/eclipsecbi/jiro-agent-ubuntu-2204:remoting-3248.3250.v3277a_8e88c9b_
image: docker.io/eclipsecbi/jiro-agent-ubuntu-2204:remoting-3261.v9c670a_4748a_9
alwaysPullImage: true
livenessProbe:
failureThreshold: 0
@@ -557,10 +284,10 @@ data:
yamlMergeStrategy: "merge"
- name: "ubuntu-2404"
namespace: "cdt"
label: "ubuntu-latest ubuntu-2404"
label: "ubuntu-latest ubuntu-2404 migration jipp-migration centos-7 centos-8 centos-latest"
containers:
- name: "jnlp"
image: docker.io/eclipsecbi/jiro-agent-ubuntu-2404:remoting-3248.3250.v3277a_8e88c9b_
image: docker.io/eclipsecbi/jiro-agent-ubuntu-2404:remoting-3261.v9c670a_4748a_9
alwaysPullImage: true
livenessProbe:
failureThreshold: 0
@@ -740,7 +467,7 @@ data:
createAccountBasedOnEmail: true
useExistingAccountWithSameEmail: true
jobConfigHistory:
excludePattern: "queue\\.xml|nodeMonitors\\.xml|UpdateCenter\\.xml|global-build-stats|LockableResourcesManager\\.xml|MilestoneStep\\.xml"
excludePattern: "queue\\.xml|nodeMonitors\\.xml|UpdateCenter\\.xml|global-build-stats|LockableResourcesManager\\.xml|MilestoneStep\\.xml|hudson.plugins.xvnc.Xvnc\\.xml"
maxDaysToKeepEntries: "60"
maxEntriesPerPage: "12"
maxHistoryEntries: "500"
@@ -888,7 +615,7 @@ data:
- installSource:
installers:
- antFromApache:
id: "1.10.12"
id: "1.10.15"
maven:
installations:
- name: "apache-maven-latest"
4 changes: 2 additions & 2 deletions instances/tools.cdt/target/k8s/statefulset.json
Original file line number Diff line number Diff line change
@@ -51,7 +51,7 @@
"env": [
{
"name": "JAVA_OPTS",
"value": "-showversion -XshowSettings:vm -XX:+AlwaysPreTouch -XX:+ParallelRefProcEnabled -XX:+DisableExplicitGC -Duser.timezone=America/Toronto -Dhudson.footerURL=https://ci.eclipse.org -Dhudson.model.UsageStatistics.disabled=true -Dhudson.lifecycle=hudson.lifecycle.ExitLifecycle -Djenkins.model.Jenkins.exitCodeOnRestart=0 -Djenkins.model.Jenkins.slaveAgentPort=50000 -Djenkins.model.Jenkins.slaveAgentPortEnforce=true -Djenkins.slaves.JnlpSlaveAgentProtocol3.enabled=false -Djenkins.install.runSetupWizard=false -Djenkins.ui.refresh=true -Djenkins.security.ManagePermission=true -Dorg.jenkinsci.plugins.durabletask.BourneShellScript.HEARTBEAT_CHECK_INTERVAL=7200 -DexecutableWar.jetty.disableCustomSessionIdCookieName=false -DexecutableWar.jetty.sessionIdCookieName=JSESSIONID.cdt -Dcasc.jenkins.config=/etc/jenkins/jenkins.yaml -Dio.jenkins.plugins.casc.ConfigurationAsCode.initialDelay=5000 -Dorg.csanchez.jenkins.plugins.kubernetes.pipeline.PodTemplateStepExecution.defaultImage=docker.io/eclipsecbi/jiro-agent-basic:remoting-3248.3250.v3277a_8e88c9b_ -Dorg.csanchez.jenkins.plugins.kubernetes.PodTemplate.connectionTimeout=180 -Dkubernetes.websocket.ping.interval=30000"
"value": "-showversion -XshowSettings:vm -XX:+AlwaysPreTouch -XX:+ParallelRefProcEnabled -XX:+DisableExplicitGC -Duser.timezone=America/Toronto -Dhudson.footerURL=https://ci.eclipse.org -Dhudson.model.UsageStatistics.disabled=true -Dhudson.lifecycle=hudson.lifecycle.ExitLifecycle -Djenkins.model.Jenkins.exitCodeOnRestart=0 -Djenkins.model.Jenkins.slaveAgentPort=50000 -Djenkins.model.Jenkins.slaveAgentPortEnforce=true -Djenkins.slaves.JnlpSlaveAgentProtocol3.enabled=false -Djenkins.install.runSetupWizard=false -Djenkins.ui.refresh=true -Djenkins.security.ManagePermission=true -Dorg.jenkinsci.plugins.durabletask.BourneShellScript.HEARTBEAT_CHECK_INTERVAL=7200 -DexecutableWar.jetty.disableCustomSessionIdCookieName=false -DexecutableWar.jetty.sessionIdCookieName=JSESSIONID.cdt -Dcasc.jenkins.config=/etc/jenkins/jenkins.yaml -Dio.jenkins.plugins.casc.ConfigurationAsCode.initialDelay=5000 -Dorg.csanchez.jenkins.plugins.kubernetes.pipeline.PodTemplateStepExecution.defaultImage=docker.io/eclipsecbi/jiro-agent-basic-ubuntu:remoting-3261.v9c670a_4748a_9 -Dorg.csanchez.jenkins.plugins.kubernetes.PodTemplate.connectionTimeout=180 -Dkubernetes.websocket.ping.interval=30000"
},
{
"name": "JENKINS_OPTS",
@@ -66,7 +66,7 @@
"value": "true"
}
],
"image": "docker.io/eclipsecbijenkins/tools.cdt:2.462.3",
"image": "docker.io/eclipsecbijenkins/tools.cdt:2.479.2",
"imagePullPolicy": "Always",
"lifecycle": {
"preStop": {
1 change: 1 addition & 0 deletions instances/tools.oomph/jenkins/configuration.yml
Original file line number Diff line number Diff line change
@@ -8,6 +8,7 @@ jenkins:
ssh:
credentialsId: "projects-storage.eclipse.org-bot-ssh"
host: "promotion-vm"
javaPath: "/opt/public/common/java/openjdk/jdk-17_x64-latest/bin/java"
port: 22
sshHostKeyVerificationStrategy:
manuallyProvidedKeyVerificationStrategy:
2 changes: 1 addition & 1 deletion instances/tools.oomph/target/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM docker.io/eclipsecbi/jiro-master:2.462.3
FROM docker.io/eclipsecbi/jiro-master:2.479.2

EXPOSE 8080
EXPOSE 50000
Loading

0 comments on commit cd2944f

Please sign in to comment.