Skip to content

Commit

Permalink
Update CBI JIPP to latest Jenkins LTS version 2.479.1
Browse files Browse the repository at this point in the history
  • Loading branch information
fredg02 committed Nov 8, 2024
1 parent 1f71f05 commit 193b95e
Show file tree
Hide file tree
Showing 7 changed files with 126 additions and 138 deletions.
2 changes: 1 addition & 1 deletion instances/technology.cbi/config.jsonnet
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
resourcePacks: 5,
},
jenkins+: {
version: "2.462.3",
version: "2.479.1",
staticAgentCount: 3,
plugins+: [
"basic-branch-build-strategies",
Expand Down
2 changes: 1 addition & 1 deletion instances/technology.cbi/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.1

EXPOSE 8080
EXPOSE 50000
Expand Down
112 changes: 50 additions & 62 deletions instances/technology.cbi/target/config.json

Large diffs are not rendered by default.

16 changes: 8 additions & 8 deletions instances/technology.cbi/target/jenkins/configuration.yml
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,7 @@ jenkins:
label: "basic"
containers:
- name: "jnlp"
image: docker.io/eclipsecbi/jiro-agent-basic:remoting-3248.3250.v3277a_8e88c9b_
image: docker.io/eclipsecbi/jiro-agent-basic:remoting-3261.v9c670a_4748a_9
alwaysPullImage: true
livenessProbe:
failureThreshold: 0
Expand Down Expand Up @@ -198,7 +198,7 @@ jenkins:
label: "basic-ubuntu"
containers:
- name: "jnlp"
image: docker.io/eclipsecbi/jiro-agent-basic-ubuntu:remoting-3248.3250.v3277a_8e88c9b_
image: docker.io/eclipsecbi/jiro-agent-basic-ubuntu:remoting-3261.v9c670a_4748a_9
alwaysPullImage: true
livenessProbe:
failureThreshold: 0
Expand Down Expand Up @@ -314,7 +314,7 @@ jenkins:
label: "migration jipp-migration centos-7"
containers:
- name: "jnlp"
image: docker.io/eclipsecbi/jiro-agent-centos-7:remoting-3248.3250.v3277a_8e88c9b_
image: docker.io/eclipsecbi/jiro-agent-centos-7:remoting-3261.v9c670a_4748a_9
alwaysPullImage: true
livenessProbe:
failureThreshold: 0
Expand Down Expand Up @@ -430,7 +430,7 @@ jenkins:
label: "centos-latest centos-8"
containers:
- name: "jnlp"
image: docker.io/eclipsecbi/jiro-agent-centos-8:remoting-3248.3250.v3277a_8e88c9b_
image: docker.io/eclipsecbi/jiro-agent-centos-8:remoting-3261.v9c670a_4748a_9
alwaysPullImage: true
livenessProbe:
failureThreshold: 0
Expand Down Expand Up @@ -546,7 +546,7 @@ jenkins:
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
Expand Down Expand Up @@ -662,7 +662,7 @@ jenkins:
label: "ubuntu-latest ubuntu-2404"
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
Expand Down Expand Up @@ -872,7 +872,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"
Expand Down Expand Up @@ -1045,7 +1045,7 @@ tool:
- installSource:
installers:
- antFromApache:
id: "1.10.12"
id: "1.10.15"
maven:
installations:
- name: "apache-maven-latest"
Expand Down
108 changes: 54 additions & 54 deletions instances/technology.cbi/target/jenkins/plugins.log
Original file line number Diff line number Diff line change
@@ -1,58 +1,58 @@
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
basic-branch-build-strategies 81.v05e333931c7d
authorize-project 1.8.1
basic-branch-build-strategies 190.v343a_ee70d920
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-disk-usage-simple 232.v713eeed2e1f4
cloudbees-folder 6.955.v81e2a_35c08d3
cloudbees-jenkins-advisor 358.v58972d19b_1f0
command-launcher 115.vd8b_301cc15d0
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 1887.v9e47623cb_043
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
docker-commons 443.v921729d5611d
display-url-api 2.209.v582ed814ff2f
docker-commons 445.v6b_646c962a_94
docker-workflow 580.vc0c340686b_54
durable-task 577.v2a_8a_4b_7c0247
echarts-api 5.5.1-1
echarts-api 5.5.1-4
eddsa-api 0.3.0-4.v84c6f0f4969e
email-ext 1844.v3ea_a_b_842374a_
email-ext 1849.v6dd03b_f6e423
embeddable-build-status 487.va_0ef04c898a_2
extended-read-permission 53.v6499940139e5
external-monitor-job 215.v2e88e894db_f8
extra-columns 1.26
extra-columns 1.27
favorite 2.221.v19ca_666b_62f5
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
gradle 2.13
gson-api 2.11.0-41.v019fcf6125dc
gitlab-branch-source 713.v9a_03496d45b_c
gitlab-plugin 1.9.6
gradle 2.13.1
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
htmlpublisher 1.36
instance-identity 201.vd2a_b_5a_468a_a_6
ionicons-api 74.v93d5eb_813d5f
Expand All @@ -66,34 +66,34 @@ jdk-tool 80.v8a_dee33ed6f0
jenkins-design-language 1.27.16
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 1308.vb_90591b_eb_996
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
ldap 770.vb_455e934581a_
mail-watcher-plugin 1.19
mailer 488.v0c9639c1a_eb_3
mailer 489.vd4b_25144138f
mask-passwords 173.v6a_077a_291eb_5
matrix-auth 3.2.2
matrix-project 838.v4d7b_7b_f9b_d4b_
maven-plugin 3.23
metrics 4.2.21-451.vd51df8df52ec
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
nexus-jenkins-plugin 3.14.431.v37ca_dc788b_b_1
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-graph-view 340.v28cecee8b_25f
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
Expand All @@ -108,38 +108,38 @@ 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
prometheus 795.v995762102f28
promoted-builds 965.vcda_c6a_e0998f
pubsub-light 1.18
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 1367.vdf2fc45f229c
simple-theme-plugin 196.v96d9592f4efa_
slack 741.v00f9591c586d
slack 751.v2e44153c8fe1
snakeyaml-api 2.3-123.v13484c65210a_
sonar 2.17.2
sse-gateway 1.27
ssh-agent 376.v8933585c69d3
ssh-credentials 343.v884f71d78167
ssh-slaves 2.973.v0fa_8c0dea_f9f
structs 338.v848422169819
support-core 1511.v3f5cc9b_a_ff55
timestamper 1.27
support-core 1523.v5486c8d6da_f3
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.10.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 3990.vd281dd77a_388
workflow-durable-task-step 1378.v6a_3e903058a_3
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 932.vb_555de1b_a_b_94
ws-cleanup 0.48
xvnc 1.28

20 changes: 10 additions & 10 deletions instances/technology.cbi/target/k8s/configmap-jenkins-config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,8 @@ metadata:
org.eclipse.cbi.jiro/project.fullName: "technology.cbi"
org.eclipse.cbi.jiro/kind: "master"
annotations:
org.eclipse.cbi.jiro/jenkins.version: "2.462.3"
org.eclipse.cbi.jiro/jenkins.actualVersion: "2.462.3"
org.eclipse.cbi.jiro/jenkins.version: "2.479.1"
org.eclipse.cbi.jiro/jenkins.actualVersion: "2.479.1"
org.eclipse.cbi.jiro/kubernetes.master.namespace: "cbi"
namespace: "cbi"
name: jenkins-config
Expand Down Expand Up @@ -105,7 +105,7 @@ data:
label: "basic"
containers:
- name: "jnlp"
image: docker.io/eclipsecbi/jiro-agent-basic:remoting-3248.3250.v3277a_8e88c9b_
image: docker.io/eclipsecbi/jiro-agent-basic:remoting-3261.v9c670a_4748a_9
alwaysPullImage: true
livenessProbe:
failureThreshold: 0
Expand Down Expand Up @@ -221,7 +221,7 @@ data:
label: "basic-ubuntu"
containers:
- name: "jnlp"
image: docker.io/eclipsecbi/jiro-agent-basic-ubuntu:remoting-3248.3250.v3277a_8e88c9b_
image: docker.io/eclipsecbi/jiro-agent-basic-ubuntu:remoting-3261.v9c670a_4748a_9
alwaysPullImage: true
livenessProbe:
failureThreshold: 0
Expand Down Expand Up @@ -337,7 +337,7 @@ data:
label: "migration jipp-migration centos-7"
containers:
- name: "jnlp"
image: docker.io/eclipsecbi/jiro-agent-centos-7:remoting-3248.3250.v3277a_8e88c9b_
image: docker.io/eclipsecbi/jiro-agent-centos-7:remoting-3261.v9c670a_4748a_9
alwaysPullImage: true
livenessProbe:
failureThreshold: 0
Expand Down Expand Up @@ -453,7 +453,7 @@ data:
label: "centos-latest centos-8"
containers:
- name: "jnlp"
image: docker.io/eclipsecbi/jiro-agent-centos-8:remoting-3248.3250.v3277a_8e88c9b_
image: docker.io/eclipsecbi/jiro-agent-centos-8:remoting-3261.v9c670a_4748a_9
alwaysPullImage: true
livenessProbe:
failureThreshold: 0
Expand Down Expand Up @@ -569,7 +569,7 @@ data:
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
Expand Down Expand Up @@ -685,7 +685,7 @@ data:
label: "ubuntu-latest ubuntu-2404"
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
Expand Down Expand Up @@ -895,7 +895,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"
Expand Down Expand Up @@ -1068,7 +1068,7 @@ data:
- installSource:
installers:
- antFromApache:
id: "1.10.12"
id: "1.10.15"
maven:
installations:
- name: "apache-maven-latest"
Expand Down
4 changes: 2 additions & 2 deletions instances/technology.cbi/target/k8s/statefulset.json
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.cbi -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-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.cbi -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",
Expand All @@ -66,7 +66,7 @@
"value": "true"
}
],
"image": "docker.io/eclipsecbijenkins/technology.cbi:2.462.3",
"image": "docker.io/eclipsecbijenkins/technology.cbi:2.479.1",
"imagePullPolicy": "Always",
"lifecycle": {
"preStop": {
Expand Down

0 comments on commit 193b95e

Please sign in to comment.