Skip to content

Commit

Permalink
Jenkins LTS upgrade follow-up
Browse files Browse the repository at this point in the history
  • Loading branch information
@fredg02
fredg02 committed Nov 29, 2024
1 parent d87217d commit cd2944f
Show file tree
Hide file tree
Showing 24 changed files with 326 additions and 3,658 deletions.
298 changes: 8 additions & 290 deletions instances/foundation-internal.jakartaee-spec-committee/target/config.json
View file

Large diffs are not rendered by default.

277 changes: 2 additions & 275 deletions instances/foundation-internal.jakartaee-spec-committee/target/jenkins/configuration.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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"
Expand Down Expand Up @@ -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
Expand Down
Loading

0 comments on commit cd2944f

Please sign in to comment.