Jenkins LTS upgrade follow-up

eclipse-cbi · Dec 5, 2024 · 5effce4 · 5effce4
1 parent 3d6d7ae
commit 5effce4
Show file tree

Hide file tree

Showing 20 changed files with 283 additions and 1,945 deletions.
diff --git a/instances/ecd.theia/jenkins/configuration.yml b/instances/ecd.theia/jenkins/configuration.yml
@@ -44,7 +44,7 @@ jenkins:
       - envVars:
           env:
           - key: "Path"
-            value: "C:\\tools\\cygwin\\bin;C:\\Users\\genie.theia\\AppData\\Roaming\\npm;C:\\Program Files\\nodejs;$Path"
+            value: "C:\\Program Files\\Git\\bin;C:\\tools\\cygwin\\bin;C:\\Users\\genie.theia\\AppData\\Roaming\\npm;C:\\Program Files\\nodejs;$Path"
       - watcher:
           offlineAddresses: "[email protected]"
           onlineAddresses: "[email protected]"

diff --git a/instances/ecd.theia/target/jenkins/configuration.yml b/instances/ecd.theia/target/jenkins/configuration.yml
@@ -397,7 +397,7 @@ jenkins:
           - envVars:
               env:
                 - key: "Path"
-                  value: "C:\\tools\\cygwin\\bin;C:\\Users\\genie.theia\\AppData\\Roaming\\npm;C:\\Program Files\\nodejs;$Path"
+                  value: "C:\\Program Files\\Git\\bin;C:\\tools\\cygwin\\bin;C:\\Users\\genie.theia\\AppData\\Roaming\\npm;C:\\Program Files\\nodejs;$Path"
           - watcher:
               offlineAddresses: "[email protected]"
               onlineAddresses: "[email protected]"

diff --git a/instances/ecd.theia/target/k8s/configmap-jenkins-config.yml b/instances/ecd.theia/target/k8s/configmap-jenkins-config.yml
@@ -420,7 +420,7 @@ data:
               - envVars:
                   env:
                     - key: "Path"
-                      value: "C:\\tools\\cygwin\\bin;C:\\Users\\genie.theia\\AppData\\Roaming\\npm;C:\\Program Files\\nodejs;$Path"
+                      value: "C:\\Program Files\\Git\\bin;C:\\tools\\cygwin\\bin;C:\\Users\\genie.theia\\AppData\\Roaming\\npm;C:\\Program Files\\nodejs;$Path"
               - watcher:
                   offlineAddresses: "[email protected]"
                   onlineAddresses: "[email protected]"

diff --git a/instances/eclipse.platform.releng/jenkins/configuration.yml b/instances/eclipse.platform.releng/jenkins/configuration.yml
@@ -37,7 +37,7 @@ jenkins:
           host: "13.68.249.87"
           port: "22"
           credentialsId: "rs68g-win10-ssh"
-          javaPath: "\"C:\\Program Files\\AdoptOpenJDK\\jdk-11.0.11.9-hotspot\\bin\\java.exe\""
+          javaPath: "C:\\Program Files\\Eclipse Adoptium\\jdk-21.0.5.11-hotspot\\bin\\java.exe"
           sshHostKeyVerificationStrategy:
             manuallyProvidedKeyVerificationStrategy:
               key: "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABgQDAkHWAKiWv/T3uaCBj8RdbPR4BW3GBdb5Digq4lpwnFc5xCLCZ/Wke6GBEBlai+zJndjm5sNYgKAAGUOFvW1t0ZCFxgS+uZ+tu2eyDoGyCAvS+XzbzN4pEGf3x/2GJE2aWoesrdx/Uhc/8J3cZG04Fy1SsllW36j4e/20PnZaCtPRBuU/9ZlX4pUDKIUDV+7ejOTTViAzxV0IqUQagiKLv1rxgkRQRgy49+oszYbTFmO7Sqy8L20sSRpSjO0eym6CTpbdjJSm70ZjlJNFocwREmlISNtdPPzY56NWQKf6qpzTlw94zZGVV/0WNdapn3pWS3OLIttVB1C1f1nHBdwvmooFgFiTJzfWaqY9wZFy+jNDi8BHHauLYySIh2PT65XWltnnJcwPM/87nk0hESuBglq3580mGbqoqYmoYhVOsJgn0r0HOHoCsfrUkk9EbUzuUh4TmbR9d6c+zrXe/p6XW8MNNoD1FC+IpruUiEIK9sJ25LAdeXP0hupL9SbddlCc="
@@ -47,7 +47,7 @@ jenkins:
           - key: "JAVA_HOME"
             value: 'C:\Program Files\AdoptOpenJDK\jdk-11.0.11.9-hotspot'
           - key: "PATH"
-            value: 'C:\Windows\system32;C:\Windows;C:\Windows\System32\Wbem;C:\Windows\System32\WindowsPowerShell\v1.0\;C:\ProgramData\GooGet;C:\Users\SSHD\AppData\Local\Microsoft\WindowsApps;C:\ProgramData\chocolatey\bin'
+            value: 'C:\Windows\system32;C:\Windows;C:\Windows\System32\Wbem;C:\Windows\System32\WindowsPowerShell\v1.0\;C:\ProgramData\GooGet;C:\Users\SSHD\AppData\Local\Microsoft\WindowsApps;C:\ProgramData\chocolatey\bin;C:\Program Files\Git\bin'
           - key: "VS90_HOME"
             value: 'C:\Program Files (x86)\Microsoft Visual Studio\2019'
           - key: "VS90COMNTOOLS"
@@ -60,7 +60,7 @@ jenkins:
             key: "[email protected]"
           - home: 'C:\Program Files\AdoptOpenJDK\jdk-11.0.11.9-hotspot'
             key: "hudson.model.JDK$DescriptorImpl@openjdk-jdk11-latest"
-          - home: 'C:\tools\cygwin\bin\git'
+          - home: 'C:\Program Files\Git\bin\git'
             key: "hudson.plugins.git.GitTool$DescriptorImpl@Default"
   - permanent:
       name: "zyt5z-centos83"
@@ -221,6 +221,8 @@ jenkins:
           locations:
           - home: "C:\\ProgramData\\chocolatey\\lib\\ant\\tools\\apache-ant-1.10.13"
             key: "hudson.tasks.Ant$AntInstallation$DescriptorImpl@apache-ant-latest"
+          - home: 'C:\Program Files\Git\bin\git'
+            key: "hudson.plugins.git.GitTool$DescriptorImpl@Default"
       remoteFS: "C:\\Users\\genie.releng\\"
       retentionStrategy: "always"
   - permanent:

diff --git a/instances/eclipse.platform.releng/target/Dockerfile b/instances/eclipse.platform.releng/target/Dockerfile
@@ -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

diff --git a/instances/eclipse.platform.releng/target/jenkins/configuration.yml b/instances/eclipse.platform.releng/target/jenkins/configuration.yml
@@ -83,6 +83,8 @@ jenkins:
         containerCapStr: "10"
         jenkinsUrl: "http://jenkins-ui.releng.svc.cluster.local/releng"
         jenkinsTunnel: "jenkins-discovery.releng.svc.cluster.local:50000"
+        garbageCollection:
+          timeout: 300
         maxRequestsPerHostStr: "32"
         namespace: "releng"
         podRetention: "never"
@@ -434,7 +436,7 @@ jenkins:
             host: "13.68.249.87"
             port: "22"
             credentialsId: "rs68g-win10-ssh"
-            javaPath: "\"C:\\Program Files\\AdoptOpenJDK\\jdk-11.0.11.9-hotspot\\bin\\java.exe\""
+            javaPath: "C:\\Program Files\\Eclipse Adoptium\\jdk-21.0.5.11-hotspot\\bin\\java.exe"
             sshHostKeyVerificationStrategy:
               manuallyProvidedKeyVerificationStrategy:
                 key: "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABgQDAkHWAKiWv/T3uaCBj8RdbPR4BW3GBdb5Digq4lpwnFc5xCLCZ/Wke6GBEBlai+zJndjm5sNYgKAAGUOFvW1t0ZCFxgS+uZ+tu2eyDoGyCAvS+XzbzN4pEGf3x/2GJE2aWoesrdx/Uhc/8J3cZG04Fy1SsllW36j4e/20PnZaCtPRBuU/9ZlX4pUDKIUDV+7ejOTTViAzxV0IqUQagiKLv1rxgkRQRgy49+oszYbTFmO7Sqy8L20sSRpSjO0eym6CTpbdjJSm70ZjlJNFocwREmlISNtdPPzY56NWQKf6qpzTlw94zZGVV/0WNdapn3pWS3OLIttVB1C1f1nHBdwvmooFgFiTJzfWaqY9wZFy+jNDi8BHHauLYySIh2PT65XWltnnJcwPM/87nk0hESuBglq3580mGbqoqYmoYhVOsJgn0r0HOHoCsfrUkk9EbUzuUh4TmbR9d6c+zrXe/p6XW8MNNoD1FC+IpruUiEIK9sJ25LAdeXP0hupL9SbddlCc="
@@ -444,7 +446,7 @@ jenkins:
                 - key: "JAVA_HOME"
                   value: 'C:\Program Files\AdoptOpenJDK\jdk-11.0.11.9-hotspot'
                 - key: "PATH"
-                  value: 'C:\Windows\system32;C:\Windows;C:\Windows\System32\Wbem;C:\Windows\System32\WindowsPowerShell\v1.0\;C:\ProgramData\GooGet;C:\Users\SSHD\AppData\Local\Microsoft\WindowsApps;C:\ProgramData\chocolatey\bin'
+                  value: 'C:\Windows\system32;C:\Windows;C:\Windows\System32\Wbem;C:\Windows\System32\WindowsPowerShell\v1.0\;C:\ProgramData\GooGet;C:\Users\SSHD\AppData\Local\Microsoft\WindowsApps;C:\ProgramData\chocolatey\bin;C:\Program Files\Git\bin'
                 - key: "VS90_HOME"
                   value: 'C:\Program Files (x86)\Microsoft Visual Studio\2019'
                 - key: "VS90COMNTOOLS"
@@ -457,7 +459,7 @@ jenkins:
                   key: "[email protected]"
                 - home: 'C:\Program Files\AdoptOpenJDK\jdk-11.0.11.9-hotspot'
                   key: "hudson.model.JDK$DescriptorImpl@openjdk-jdk11-latest"
-                - home: 'C:\tools\cygwin\bin\git'
+                - home: 'C:\Program Files\Git\bin\git'
                   key: "hudson.plugins.git.GitTool$DescriptorImpl@Default"
     - permanent:
         name: "zyt5z-centos83"
@@ -618,6 +620,8 @@ jenkins:
               locations:
                 - home: "C:\\ProgramData\\chocolatey\\lib\\ant\\tools\\apache-ant-1.10.13"
                   key: "hudson.tasks.Ant$AntInstallation$DescriptorImpl@apache-ant-latest"
+                - home: 'C:\Program Files\Git\bin\git'
+                  key: "hudson.plugins.git.GitTool$DescriptorImpl@Default"
         remoteFS: "C:\\Users\\genie.releng\\"
         retentionStrategy: "always"
     - permanent:

diff --git a/instances/eclipse.platform.releng/target/jenkins/plugins.log b/instances/eclipse.platform.releng/target/jenkins/plugins.log
@@ -14,39 +14,39 @@ 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.955.v81e2a_35c08d3
-command-launcher 115.vd8b_301cc15d0
+cloudbees-folder 6.963.v6edc0fc71472
+command-launcher 116.vd85919c54a_d6
 commons-compress-api 1.26.1-2
 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 1873.vea_5814ca_9c93
-credentials 1384.vf0a_2ed06f9c6
-credentials-binding 681.vf91669a_32e45
+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
+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 1849.v6dd03b_f6e423
+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-code-review 0.4.9
 ghprb 1.42.2
-git 5.5.2
-git-client 5.0.0
+git 5.6.0
+git-client 6.1.0
 git-forensics 2.2.1
 git-parameter 0.10.0
 github 1.40.0
-github-api 1.321-468.v6a_9f5f2d5a_7e
+github-api 1.321-478.vc9ce627ce001
 github-branch-source 1807.v50351eb_7dd13
 github-checks 589.v845136f916cd
 gitlab-api 5.6.0-97.v6603a_83f8690
-gitlab-branch-source 714.v45a_1ef5eb_247
-gitlab-plugin 1.8.2
+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 371.v884a_4dd60fb_6
@@ -61,7 +61,7 @@ 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
-job-dsl 1.89
+job-dsl 1.90
 jobConfigHistory 1283.veb_dfb_00b_5ec0
 joda-time-api 2.13.0-93.v9934da_29b_a_e9
 jquery3-api 3.7.1-2
@@ -72,65 +72,65 @@ 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
+ldap 770.vb_455e934581a_
 mail-watcher-plugin 1.19
-mailer 488.v0c9639c1a_eb_3
+mailer 489.vd4b_25144138f
 matrix-auth 3.2.3
-matrix-project 839.vff91cd7e3a_b_2
+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-graph-view 340.v28cecee8b_25f
+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
 pipeline-utility-steps 2.18.0
 plain-credentials 183.va_de8f1dd5a_2b_
 plugin-util-api 5.1.0
-prism-api 1.29.0-17
+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 1367.vdf2fc45f229c
+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.10.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 3990.vd281dd77a_388
-workflow-durable-task-step 1378.v6a_3e903058a_3
-workflow-job 1436.vfa_244484591f
+workflow-cps 4000.v5198556e9cea_
+workflow-durable-task-step 1398.vf6c9e89e5988
+workflow-job 1472.ve4d5eca_143c4
 workflow-multibranch 795.ve0cb_1f45ca_9a_
 workflow-scm-step 427.v4ca_6512e7df1
 workflow-step-api 678.v3ee58b_469476
-workflow-support 932.vb_555de1b_a_b_94
-ws-cleanup 0.47
+workflow-support 936.v9fa_77211ca_e1
+ws-cleanup 0.48
 xvnc 1.28
 
diff --git a/instances/eclipse.platform.releng/target/k8s/configmap-jenkins-config.yml b/instances/eclipse.platform.releng/target/k8s/configmap-jenkins-config.yml
@@ -106,6 +106,8 @@ data:
             containerCapStr: "10"
             jenkinsUrl: "http://jenkins-ui.releng.svc.cluster.local/releng"
             jenkinsTunnel: "jenkins-discovery.releng.svc.cluster.local:50000"
+            garbageCollection:
+              timeout: 300
             maxRequestsPerHostStr: "32"
             namespace: "releng"
             podRetention: "never"
@@ -457,7 +459,7 @@ data:
                 host: "13.68.249.87"
                 port: "22"
                 credentialsId: "rs68g-win10-ssh"
-                javaPath: "\"C:\\Program Files\\AdoptOpenJDK\\jdk-11.0.11.9-hotspot\\bin\\java.exe\""
+                javaPath: "C:\\Program Files\\Eclipse Adoptium\\jdk-21.0.5.11-hotspot\\bin\\java.exe"
                 sshHostKeyVerificationStrategy:
                   manuallyProvidedKeyVerificationStrategy:
                     key: "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABgQDAkHWAKiWv/T3uaCBj8RdbPR4BW3GBdb5Digq4lpwnFc5xCLCZ/Wke6GBEBlai+zJndjm5sNYgKAAGUOFvW1t0ZCFxgS+uZ+tu2eyDoGyCAvS+XzbzN4pEGf3x/2GJE2aWoesrdx/Uhc/8J3cZG04Fy1SsllW36j4e/20PnZaCtPRBuU/9ZlX4pUDKIUDV+7ejOTTViAzxV0IqUQagiKLv1rxgkRQRgy49+oszYbTFmO7Sqy8L20sSRpSjO0eym6CTpbdjJSm70ZjlJNFocwREmlISNtdPPzY56NWQKf6qpzTlw94zZGVV/0WNdapn3pWS3OLIttVB1C1f1nHBdwvmooFgFiTJzfWaqY9wZFy+jNDi8BHHauLYySIh2PT65XWltnnJcwPM/87nk0hESuBglq3580mGbqoqYmoYhVOsJgn0r0HOHoCsfrUkk9EbUzuUh4TmbR9d6c+zrXe/p6XW8MNNoD1FC+IpruUiEIK9sJ25LAdeXP0hupL9SbddlCc="
@@ -467,7 +469,7 @@ data:
                     - key: "JAVA_HOME"
                       value: 'C:\Program Files\AdoptOpenJDK\jdk-11.0.11.9-hotspot'
                     - key: "PATH"
-                      value: 'C:\Windows\system32;C:\Windows;C:\Windows\System32\Wbem;C:\Windows\System32\WindowsPowerShell\v1.0\;C:\ProgramData\GooGet;C:\Users\SSHD\AppData\Local\Microsoft\WindowsApps;C:\ProgramData\chocolatey\bin'
+                      value: 'C:\Windows\system32;C:\Windows;C:\Windows\System32\Wbem;C:\Windows\System32\WindowsPowerShell\v1.0\;C:\ProgramData\GooGet;C:\Users\SSHD\AppData\Local\Microsoft\WindowsApps;C:\ProgramData\chocolatey\bin;C:\Program Files\Git\bin'
                     - key: "VS90_HOME"
                       value: 'C:\Program Files (x86)\Microsoft Visual Studio\2019'
                     - key: "VS90COMNTOOLS"
@@ -480,7 +482,7 @@ data:
                       key: "[email protected]"
                     - home: 'C:\Program Files\AdoptOpenJDK\jdk-11.0.11.9-hotspot'
                       key: "hudson.model.JDK$DescriptorImpl@openjdk-jdk11-latest"
-                    - home: 'C:\tools\cygwin\bin\git'
+                    - home: 'C:\Program Files\Git\bin\git'
                       key: "hudson.plugins.git.GitTool$DescriptorImpl@Default"
         - permanent:
             name: "zyt5z-centos83"
@@ -641,6 +643,8 @@ data:
                   locations:
                     - home: "C:\\ProgramData\\chocolatey\\lib\\ant\\tools\\apache-ant-1.10.13"
                       key: "hudson.tasks.Ant$AntInstallation$DescriptorImpl@apache-ant-latest"
+                    - home: 'C:\Program Files\Git\bin\git'
+                      key: "hudson.plugins.git.GitTool$DescriptorImpl@Default"
             remoteFS: "C:\\Users\\genie.releng\\"
             retentionStrategy: "always"
         - permanent:

diff --git a/instances/iot.zenoh/target/Dockerfile b/instances/iot.zenoh/target/Dockerfile
@@ -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