Skip to content

Commit

Permalink
Update all instances to latest Jenkins LTS release 2.452.4
Browse files Browse the repository at this point in the history
  • Loading branch information
@fredg02
fredg02 committed Aug 8, 2024
1 parent 0e36103 commit 0bf70b7
Show file tree
Hide file tree
Showing 1,369 changed files with 41,154 additions and 27,099 deletions.
2 changes: 1 addition & 1 deletion instances/adoptium.emt4j/target/Dockerfile
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM docker.io/eclipsecbi/jiro-master:2.452.1
FROM docker.io/eclipsecbi/jiro-master:2.452.4

EXPOSE 8080
EXPOSE 50000
Expand Down
80 changes: 49 additions & 31 deletions instances/adoptium.emt4j/target/config.json
View file

Large diffs are not rendered by default.

60 changes: 40 additions & 20 deletions instances/adoptium.emt4j/target/jenkins/configuration.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -82,18 +82,14 @@ jenkins:
label: "basic"
containers:
- name: "jnlp"
image: docker.io/eclipsecbi/jiro-agent-basic:remoting-3206.vb_15dcf73f6a_9
image: docker.io/eclipsecbi/jiro-agent-basic:remoting-3206.3208.v409508a_675ff
alwaysPullImage: true
livenessProbe:
failureThreshold: 0
initialDelaySeconds: 0
periodSeconds: 0
successThreshold: 0
timeoutSeconds: 0
resourceLimitCpu: "2000m"
resourceRequestCpu: "1000m"
resourceLimitMemory: "4096Mi"
resourceRequestMemory: "4096Mi"
ttyEnabled: true
command: ""
args: ""
Expand Down Expand Up @@ -139,6 +135,13 @@ jenkins:
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
Expand All @@ -163,23 +166,21 @@ jenkins:
- name: m2-dir
configMap:
name: m2-dir
inheritYamlMergeStrategy: "true"
yamlMergeStrategy: "merge"
- name: "basic-ubuntu"
namespace: "emt4j"
label: "basic-ubuntu"
containers:
- name: "jnlp"
image: docker.io/eclipsecbi/jiro-agent-basic-ubuntu:remoting-3206.vb_15dcf73f6a_9
image: docker.io/eclipsecbi/jiro-agent-basic-ubuntu:remoting-3206.3208.v409508a_675ff
alwaysPullImage: true
livenessProbe:
failureThreshold: 0
initialDelaySeconds: 0
periodSeconds: 0
successThreshold: 0
timeoutSeconds: 0
resourceLimitCpu: "2000m"
resourceRequestCpu: "1000m"
resourceLimitMemory: "4096Mi"
resourceRequestMemory: "4096Mi"
ttyEnabled: true
command: ""
args: ""
Expand Down Expand Up @@ -225,6 +226,13 @@ jenkins:
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
Expand All @@ -249,23 +257,21 @@ jenkins:
- name: m2-dir
configMap:
name: m2-dir
inheritYamlMergeStrategy: "true"
yamlMergeStrategy: "merge"
- name: "centos-7"
namespace: "emt4j"
label: "migration jipp-migration centos-7"
containers:
- name: "jnlp"
image: docker.io/eclipsecbi/jiro-agent-centos-7:remoting-3206.vb_15dcf73f6a_9
image: docker.io/eclipsecbi/jiro-agent-centos-7:remoting-3206.3208.v409508a_675ff
alwaysPullImage: true
livenessProbe:
failureThreshold: 0
initialDelaySeconds: 0
periodSeconds: 0
successThreshold: 0
timeoutSeconds: 0
resourceLimitCpu: "2000m"
resourceRequestCpu: "1000m"
resourceLimitMemory: "4096Mi"
resourceRequestMemory: "4096Mi"
ttyEnabled: true
command: ""
args: ""
Expand Down Expand Up @@ -311,6 +317,13 @@ jenkins:
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
Expand All @@ -335,23 +348,21 @@ jenkins:
- name: m2-dir
configMap:
name: m2-dir
inheritYamlMergeStrategy: "true"
yamlMergeStrategy: "merge"
- name: "centos-8"
namespace: "emt4j"
label: "centos-latest centos-8"
containers:
- name: "jnlp"
image: docker.io/eclipsecbi/jiro-agent-centos-8:remoting-3206.vb_15dcf73f6a_9
image: docker.io/eclipsecbi/jiro-agent-centos-8:remoting-3206.3208.v409508a_675ff
alwaysPullImage: true
livenessProbe:
failureThreshold: 0
initialDelaySeconds: 0
periodSeconds: 0
successThreshold: 0
timeoutSeconds: 0
resourceLimitCpu: "2000m"
resourceRequestCpu: "1000m"
resourceLimitMemory: "4096Mi"
resourceRequestMemory: "4096Mi"
ttyEnabled: true
command: ""
args: ""
Expand Down Expand Up @@ -397,6 +408,13 @@ jenkins:
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
Expand All @@ -421,6 +439,8 @@ jenkins:
- name: m2-dir
configMap:
name: m2-dir
inheritYamlMergeStrategy: "true"
yamlMergeStrategy: "merge"
security:
apiToken:
creationOfLegacyTokenEnabled: false
Expand Down
62 changes: 41 additions & 21 deletions instances/adoptium.emt4j/target/k8s/configmap-jenkins-config.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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.452.1"
org.eclipse.cbi.jiro/jenkins.actualVersion: "2.452.4"
org.eclipse.cbi.jiro/kubernetes.master.namespace: "emt4j"
namespace: "emt4j"
name: jenkins-config
Expand Down Expand Up @@ -105,18 +105,14 @@ data:
label: "basic"
containers:
- name: "jnlp"
image: docker.io/eclipsecbi/jiro-agent-basic:remoting-3206.vb_15dcf73f6a_9
image: docker.io/eclipsecbi/jiro-agent-basic:remoting-3206.3208.v409508a_675ff
alwaysPullImage: true
livenessProbe:
failureThreshold: 0
initialDelaySeconds: 0
periodSeconds: 0
successThreshold: 0
timeoutSeconds: 0
resourceLimitCpu: "2000m"
resourceRequestCpu: "1000m"
resourceLimitMemory: "4096Mi"
resourceRequestMemory: "4096Mi"
ttyEnabled: true
command: ""
args: ""
Expand Down Expand Up @@ -162,6 +158,13 @@ data:
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
Expand All @@ -186,23 +189,21 @@ data:
- name: m2-dir
configMap:
name: m2-dir
inheritYamlMergeStrategy: "true"
yamlMergeStrategy: "merge"
- name: "basic-ubuntu"
namespace: "emt4j"
label: "basic-ubuntu"
containers:
- name: "jnlp"
image: docker.io/eclipsecbi/jiro-agent-basic-ubuntu:remoting-3206.vb_15dcf73f6a_9
image: docker.io/eclipsecbi/jiro-agent-basic-ubuntu:remoting-3206.3208.v409508a_675ff
alwaysPullImage: true
livenessProbe:
failureThreshold: 0
initialDelaySeconds: 0
periodSeconds: 0
successThreshold: 0
timeoutSeconds: 0
resourceLimitCpu: "2000m"
resourceRequestCpu: "1000m"
resourceLimitMemory: "4096Mi"
resourceRequestMemory: "4096Mi"
ttyEnabled: true
command: ""
args: ""
Expand Down Expand Up @@ -248,6 +249,13 @@ data:
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
Expand All @@ -272,23 +280,21 @@ data:
- name: m2-dir
configMap:
name: m2-dir
inheritYamlMergeStrategy: "true"
yamlMergeStrategy: "merge"
- name: "centos-7"
namespace: "emt4j"
label: "migration jipp-migration centos-7"
containers:
- name: "jnlp"
image: docker.io/eclipsecbi/jiro-agent-centos-7:remoting-3206.vb_15dcf73f6a_9
image: docker.io/eclipsecbi/jiro-agent-centos-7:remoting-3206.3208.v409508a_675ff
alwaysPullImage: true
livenessProbe:
failureThreshold: 0
initialDelaySeconds: 0
periodSeconds: 0
successThreshold: 0
timeoutSeconds: 0
resourceLimitCpu: "2000m"
resourceRequestCpu: "1000m"
resourceLimitMemory: "4096Mi"
resourceRequestMemory: "4096Mi"
ttyEnabled: true
command: ""
args: ""
Expand Down Expand Up @@ -334,6 +340,13 @@ data:
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
Expand All @@ -358,23 +371,21 @@ data:
- name: m2-dir
configMap:
name: m2-dir
inheritYamlMergeStrategy: "true"
yamlMergeStrategy: "merge"
- name: "centos-8"
namespace: "emt4j"
label: "centos-latest centos-8"
containers:
- name: "jnlp"
image: docker.io/eclipsecbi/jiro-agent-centos-8:remoting-3206.vb_15dcf73f6a_9
image: docker.io/eclipsecbi/jiro-agent-centos-8:remoting-3206.3208.v409508a_675ff
alwaysPullImage: true
livenessProbe:
failureThreshold: 0
initialDelaySeconds: 0
periodSeconds: 0
successThreshold: 0
timeoutSeconds: 0
resourceLimitCpu: "2000m"
resourceRequestCpu: "1000m"
resourceLimitMemory: "4096Mi"
resourceRequestMemory: "4096Mi"
ttyEnabled: true
command: ""
args: ""
Expand Down Expand Up @@ -420,6 +431,13 @@ data:
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
Expand All @@ -444,6 +462,8 @@ data:
- name: m2-dir
configMap:
name: m2-dir
inheritYamlMergeStrategy: "true"
yamlMergeStrategy: "merge"
security:
apiToken:
creationOfLegacyTokenEnabled: false
Expand Down
4 changes: 2 additions & 2 deletions instances/adoptium.emt4j/target/k8s/statefulset.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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.emt4j -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-3206.vb_15dcf73f6a_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.emt4j -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-3206.3208.v409508a_675ff -Dorg.csanchez.jenkins.plugins.kubernetes.PodTemplate.connectionTimeout=180 -Dkubernetes.websocket.ping.interval=30000"
},
{
"name": "JENKINS_OPTS",
Expand All @@ -66,7 +66,7 @@
"value": "true"
}
],
"image": "docker.io/eclipsecbijenkins/adoptium.emt4j:2.452.1",
"image": "docker.io/eclipsecbijenkins/adoptium.emt4j:2.452.4",
"imagePullPolicy": "Always",
"lifecycle": {
"preStop": {
Expand Down
2 changes: 1 addition & 1 deletion instances/adoptium.mc/target/Dockerfile
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM docker.io/eclipsecbi/jiro-master:2.452.1
FROM docker.io/eclipsecbi/jiro-master:2.452.4

EXPOSE 8080
EXPOSE 50000
Expand Down
Loading

0 comments on commit 0bf70b7

Please sign in to comment.