From 6e37cfa67db7c3c8a08a5456f8696d42148d8a5f Mon Sep 17 00:00:00 2001 From: "sebastien.heurtematte" Date: Wed, 8 Jan 2025 09:19:14 +0100 Subject: [PATCH] feat: migrate webdev instance to releng-pipeline 0.12.0 Related to https://gitlab.eclipse.org/eclipsefdn/it/releng/jenkins-pipeline-service/jenkins-pipeline-library/-/issues/20 Signed-off-by: sebastien.heurtematte --- .../jenkins/configuration.yml | 2 +- .../target/config.json | 4 +- .../target/jenkins/configuration.yml | 6 ++- .../target/jenkins/plugins.log | 40 +++++++++---------- .../target/k8s/configmap-jenkins-config.yml | 6 ++- 5 files changed, 33 insertions(+), 25 deletions(-) diff --git a/instances/foundation-internal.webdev/jenkins/configuration.yml b/instances/foundation-internal.webdev/jenkins/configuration.yml index 34db23238..e1775e89d 100644 --- a/instances/foundation-internal.webdev/jenkins/configuration.yml +++ b/instances/foundation-internal.webdev/jenkins/configuration.yml @@ -51,7 +51,7 @@ unclassified: cachingConfiguration: excludedVersionsStr: "main" refreshTimeMinutes: 10080 - defaultVersion: "refs/tags/v0.11.0" + defaultVersion: "refs/tags/v0.12.0" retriever: modernSCM: scm: diff --git a/instances/foundation-internal.webdev/target/config.json b/instances/foundation-internal.webdev/target/config.json index a7bba7f78..31166723b 100644 --- a/instances/foundation-internal.webdev/target/config.json +++ b/instances/foundation-internal.webdev/target/config.json @@ -456,8 +456,8 @@ "id": "2.479.2", "key_fingerprint": "5BA31D57EF5975CA", "plugin_manager": { - "jar": "https://github.com/jenkinsci/plugin-installation-manager-tool/releases/download/2.13.0/jenkins-plugin-manager-2.13.0.jar", - "version": "2.13.0" + "jar": "https://github.com/jenkinsci/plugin-installation-manager-tool/releases/download/2.13.2/jenkins-plugin-manager-2.13.2.jar", + "version": "2.13.2" }, "pluginroot": "/var/cache/jenkins/plugins", "plugins": [ diff --git a/instances/foundation-internal.webdev/target/jenkins/configuration.yml b/instances/foundation-internal.webdev/target/jenkins/configuration.yml index dc888577a..3b271909d 100644 --- a/instances/foundation-internal.webdev/target/jenkins/configuration.yml +++ b/instances/foundation-internal.webdev/target/jenkins/configuration.yml @@ -83,6 +83,8 @@ jenkins: containerCapStr: "20" jenkinsUrl: "http://jenkins-ui.foundation-internal-webdev.svc.cluster.local/ci/webdev" jenkinsTunnel: "jenkins-discovery.foundation-internal-webdev.svc.cluster.local:50000" + garbageCollection: + timeout: 300 maxRequestsPerHostStr: "32" namespace: "foundation-internal-webdev" podRetention: "never" @@ -496,7 +498,7 @@ unclassified: cachingConfiguration: excludedVersionsStr: "main" refreshTimeMinutes: 10080 - defaultVersion: "refs/tags/v0.11.0" + defaultVersion: "refs/tags/v0.12.0" retriever: modernSCM: scm: @@ -617,6 +619,8 @@ tool: home: "/opt/tools/java/adoptopenjdk/openj9-jdk-8/latest" - name: "temurin-latest" home: "/opt/tools/java/temurin/latest" + - name: "temurin-jdk23-latest" + home: "/opt/tools/java/temurin/jdk-23/latest" - name: "temurin-jdk22-latest" home: "/opt/tools/java/temurin/jdk-22/latest" - name: "temurin-jdk21-latest" diff --git a/instances/foundation-internal.webdev/target/jenkins/plugins.log b/instances/foundation-internal.webdev/target/jenkins/plugins.log index cba1f119c..278594d74 100644 --- a/instances/foundation-internal.webdev/target/jenkins/plugins.log +++ b/instances/foundation-internal.webdev/target/jenkins/plugins.log @@ -8,19 +8,19 @@ asm-api 9.7.1-97.v4cc844130d97 authentication-tokens 1.119.v50285141b_7e1 authorize-project 1.8.1 bootstrap5-api 5.3.3-1 -bouncycastle-api 2.30.1.78.1-248.ve27176eb_46cb_ -branch-api 2.1200.v4b_a_3da_2eb_db_4 +bouncycastle-api 2.30.1.79-254.vfdb_814e7791e +branch-api 2.1206.vd9f35001c95c build-timeout 1.33 caffeine-api 3.1.8-133.v17b_1ff2e0599 checks-api 2.2.1 cloudbees-disk-usage-simple 232.v713eeed2e1f4 -cloudbees-folder 6.959.v4ed5cc9e2dd4 +cloudbees-folder 6.975.v4161e479479f 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 980.v88956a_a_5d6a_d -configuration-as-code 1897.v79281e066ea_7 -credentials 1389.vd7a_b_f5fa_50a_2 +configuration-as-code 1915.vcdd0a_d0d2625 +credentials 1405.vb_cda_74a_f8974 credentials-binding 687.v619cb_15e923f data-tables-api 2.1.8-1 disable-failed-job 1.15 @@ -28,16 +28,16 @@ display-url-api 2.209.v582ed814ff2f docker-commons 445.v6b_646c962a_94 docker-workflow 580.vc0c340686b_54 durable-task 581.v299a_5609d767 -echarts-api 5.5.1-4 +echarts-api 5.5.1-5 eddsa-api 0.3.0-4.v84c6f0f4969e -email-ext 1861.vdb_d991590994 +email-ext 1866.v14fa_6d201654 extended-read-permission 53.v6499940139e5 external-monitor-job 215.v2e88e894db_f8 extra-columns 1.27 font-awesome-api 6.6.0-2 -forensics-api 2.6.0 +forensics-api 2.7.0 ghprb 1.42.2 -git 5.6.0 +git 5.7.0 git-client 6.1.0 git-parameter 0.10.0 github 1.40.0 @@ -64,10 +64,10 @@ 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-101.v7a_8666713110 +json-api 20241224-119.va_dca_a_b_ea_7da_5 json-path-api 2.9.0-118.v7f23ed82a_8b_8 -junit 1309.v0078b_fecd6ed -kubernetes 4296.v20a_7e4d77cf6 +junit 1312.v1a_235a_b_94a_31 +kubernetes 4306.vc91e951ea_eb_d kubernetes-cli 1.12.1 kubernetes-client-api 6.10.0-240.v57880ce8b_0b_2 kubernetes-credentials 190.v03c305394deb_ @@ -78,9 +78,9 @@ 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-181.v1de5b_83857df +mina-sshd-api-common 2.14.0-138.v6341ee58e1df +mina-sshd-api-core 2.14.0-138.v6341ee58e1df +okhttp-api 4.11.0-183.va_87fc7a_89810 openshift-client 1.1.0.424.v829cb_ccf8798 pam-auth 1.11 parameterized-trigger 806.vf6fff3e28c3e @@ -88,7 +88,7 @@ pipeline-build-step 540.vb_e8849e1a_b_d8 pipeline-github 2.8-159.09e4403bc62f pipeline-graph-analysis 216.vfd8b_ece330ca_ pipeline-graph-view 382.vb_9a_27b_7b_ea_71 -pipeline-groovy-lib 744.v5b_556ee7c253 +pipeline-groovy-lib 745.vdf6077913de0 pipeline-input-step 495.ve9c153f6067b_ pipeline-maven 1469.ve15ca_a_b_90b_44 pipeline-maven-api 1469.ve15ca_a_b_90b_44 @@ -103,7 +103,7 @@ pipeline-stage-view 2.34 plain-credentials 183.va_de8f1dd5a_2b_ plugin-util-api 5.1.0 prism-api 1.29.0-18 -prometheus 795.v995762102f28 +prometheus 801.v98e119d8eeda_ promoted-builds 965.vcda_c6a_e0998f rebuild 332.va_1ee476d8f6d resource-disposer 0.25 @@ -115,7 +115,7 @@ snakeyaml-api 2.3-123.v13484c65210a_ sonar 2.17.3 ssh-agent 376.v8933585c69d3 ssh-credentials 349.vb_8b_6b_9709f5b_ -ssh-slaves 2.973.v0fa_8c0dea_f9f +ssh-slaves 3.1021.va_cc11b_de26a_e structs 338.v848422169819 timestamper 1.28 token-macro 400.v35420b_922dcb_ @@ -125,9 +125,9 @@ warnings-ng 11.12.0 workflow-aggregator 600.vb_57cdd26fdd7 workflow-api 1336.vee415d95c521 workflow-basic-steps 1058.vcb_fc1e3a_21a_9 -workflow-cps 3996.va_f5c1799f978 +workflow-cps 4007.vd705fc76a_34e workflow-durable-task-step 1398.vf6c9e89e5988 -workflow-job 1468.vcf4f5ee92395 +workflow-job 1476.v90f02a_225559 workflow-multibranch 795.ve0cb_1f45ca_9a_ workflow-scm-step 427.v4ca_6512e7df1 workflow-step-api 678.v3ee58b_469476 diff --git a/instances/foundation-internal.webdev/target/k8s/configmap-jenkins-config.yml b/instances/foundation-internal.webdev/target/k8s/configmap-jenkins-config.yml index b2a4c3564..77692b164 100644 --- a/instances/foundation-internal.webdev/target/k8s/configmap-jenkins-config.yml +++ b/instances/foundation-internal.webdev/target/k8s/configmap-jenkins-config.yml @@ -106,6 +106,8 @@ data: containerCapStr: "20" jenkinsUrl: "http://jenkins-ui.foundation-internal-webdev.svc.cluster.local/ci/webdev" jenkinsTunnel: "jenkins-discovery.foundation-internal-webdev.svc.cluster.local:50000" + garbageCollection: + timeout: 300 maxRequestsPerHostStr: "32" namespace: "foundation-internal-webdev" podRetention: "never" @@ -519,7 +521,7 @@ data: cachingConfiguration: excludedVersionsStr: "main" refreshTimeMinutes: 10080 - defaultVersion: "refs/tags/v0.11.0" + defaultVersion: "refs/tags/v0.12.0" retriever: modernSCM: scm: @@ -640,6 +642,8 @@ data: home: "/opt/tools/java/adoptopenjdk/openj9-jdk-8/latest" - name: "temurin-latest" home: "/opt/tools/java/temurin/latest" + - name: "temurin-jdk23-latest" + home: "/opt/tools/java/temurin/jdk-23/latest" - name: "temurin-jdk22-latest" home: "/opt/tools/java/temurin/jdk-22/latest" - name: "temurin-jdk21-latest"