Upgrade to latest Jenkins LTS release 2.492.2

instances/adoptium.emt4j/target/Dockerfile

@@ -1,4 +1,4 @@
-FROM docker.io/eclipsecbi/jiro-master:2.479.2
+FROM docker.io/eclipsecbi/jiro-master:2.492.2
 
 EXPOSE 8080
 EXPOSE 50000

instances/adoptium.emt4j/target/jenkins/configuration.yml

@@ -13,9 +13,6 @@ jenkins:
   mode: EXCLUSIVE
   systemMessage: ""
   disableRememberMe: false
-  agentProtocols:
-    - "JNLP4-connect"
-    - "Ping"
   authorizationStrategy:
     projectMatrix:
       entries:
@@ -73,6 +70,8 @@ jenkins:
         containerCapStr: "2"
         jenkinsUrl: "http://jenkins-ui.emt4j.svc.cluster.local/emt4j"
         jenkinsTunnel: "jenkins-discovery.emt4j.svc.cluster.local:50000"
+        garbageCollection:
+          timeout: 300
         maxRequestsPerHostStr: "32"
         namespace: "emt4j"
         podRetention: "never"
@@ -82,7 +81,7 @@ jenkins:
             label: "basic basic-ubuntu"
             containers:
               - name: "jnlp"
-                image: docker.io/eclipsecbi/jiro-agent-basic-ubuntu:remoting-3261.v9c670a_4748a_9
+                image: docker.io/eclipsecbi/jiro-agent-basic-ubuntu:remoting-3283.v92c105e0f819
                 alwaysPullImage: true
                 livenessProbe:
                   failureThreshold: 0
@@ -173,7 +172,7 @@ jenkins:
             label: "ubuntu-2204"
             containers:
               - name: "jnlp"
-                image: docker.io/eclipsecbi/jiro-agent-ubuntu-2204:remoting-3261.v9c670a_4748a_9
+                image: docker.io/eclipsecbi/jiro-agent-ubuntu-2204:remoting-3283.v92c105e0f819
                 alwaysPullImage: true
                 livenessProbe:
                   failureThreshold: 0
@@ -264,7 +263,7 @@ jenkins:
             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
+                image: docker.io/eclipsecbi/jiro-agent-ubuntu-2404:remoting-3283.v92c105e0f819
                 alwaysPullImage: true
                 livenessProbe:
                   failureThreshold: 0
@@ -437,6 +436,13 @@ unclassified:
     showBuildBadges: "never"
     showChangeReasonCommentWindow: false
     skipDuplicateHistory: true
+  hashicorpVault:
+    configuration:
+      disableChildPoliciesOverride: false
+      engineVersion: 2
+      timeout: 60
+      vaultCredentialId: "secretsmanager-approle"
+      vaultUrl: "https://secretsmanager.eclipse.org"
 tool:
   jdk:
     installations:
@@ -522,6 +528,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"

instances/adoptium.emt4j/target/jenkins/title.js

@@ -1 +1,15 @@
 document.title = "Eclipse Migration Toolkit for Java - " + document.title;
+document.addEventListener('DOMContentLoaded', function() {
+    let header = document.querySelector('.page-header__brand');
+    if (header) {
+        let newLink = document.createElement('a');
+        newLink.href = 'https://github.com/eclipse-cbi/jiro/blob/master/instances/adoptium.emt4j/target/config.json';
+        newLink.textContent = 'JCasC Source';
+        newLink.style = 'color: white; border-left: 1px solid white; padding-left: 1em; font-size: 1.1em; position: relative; top: 0.2em; left: -1.6em;';
+        newLink.target = '_blank';
+        newLink.title = 'JIRO JCasC Configuration as Code';
+        header.appendChild(newLink);
+    } else {
+        console.log('Element with class "header" not found.');
+    }
+});

instances/adoptium.emt4j/target/k8s/configmap-jenkins-config.yml

@@ -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.479.2"
+    org.eclipse.cbi.jiro/jenkins.actualVersion: "2.492.2"
     org.eclipse.cbi.jiro/kubernetes.master.namespace: "emt4j"
   namespace: "emt4j"
   name: jenkins-config
@@ -36,9 +36,6 @@ data:
       mode: EXCLUSIVE
       systemMessage: ""
       disableRememberMe: false
-      agentProtocols:
-        - "JNLP4-connect"
-        - "Ping"
       authorizationStrategy:
         projectMatrix:
           entries:
@@ -96,6 +93,8 @@ data:
             containerCapStr: "2"
             jenkinsUrl: "http://jenkins-ui.emt4j.svc.cluster.local/emt4j"
             jenkinsTunnel: "jenkins-discovery.emt4j.svc.cluster.local:50000"
+            garbageCollection:
+              timeout: 300
             maxRequestsPerHostStr: "32"
             namespace: "emt4j"
             podRetention: "never"
@@ -105,7 +104,7 @@ data:
                 label: "basic basic-ubuntu"
                 containers:
                   - name: "jnlp"
-                    image: docker.io/eclipsecbi/jiro-agent-basic-ubuntu:remoting-3261.v9c670a_4748a_9
+                    image: docker.io/eclipsecbi/jiro-agent-basic-ubuntu:remoting-3283.v92c105e0f819
                     alwaysPullImage: true
                     livenessProbe:
                       failureThreshold: 0
@@ -196,7 +195,7 @@ data:
                 label: "ubuntu-2204"
                 containers:
                   - name: "jnlp"
-                    image: docker.io/eclipsecbi/jiro-agent-ubuntu-2204:remoting-3261.v9c670a_4748a_9
+                    image: docker.io/eclipsecbi/jiro-agent-ubuntu-2204:remoting-3283.v92c105e0f819
                     alwaysPullImage: true
                     livenessProbe:
                       failureThreshold: 0
@@ -287,7 +286,7 @@ data:
                 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
+                    image: docker.io/eclipsecbi/jiro-agent-ubuntu-2404:remoting-3283.v92c105e0f819
                     alwaysPullImage: true
                     livenessProbe:
                       failureThreshold: 0
@@ -460,6 +459,13 @@ data:
         showBuildBadges: "never"
         showChangeReasonCommentWindow: false
         skipDuplicateHistory: true
+      hashicorpVault:
+        configuration:
+          disableChildPoliciesOverride: false
+          engineVersion: 2
+          timeout: 60
+          vaultCredentialId: "secretsmanager-approle"
+          vaultUrl: "https://secretsmanager.eclipse.org"
     tool:
       jdk:
         installations:
@@ -545,6 +551,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"

instances/adoptium.emt4j/target/k8s/statefulset.json

@@ -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-ubuntu:remoting-3261.v9c670a_4748a_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.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-ubuntu:remoting-3283.v92c105e0f819 -Dorg.csanchez.jenkins.plugins.kubernetes.PodTemplate.connectionTimeout=180 -Dkubernetes.websocket.ping.interval=30000"
                      },
                      {
                         "name": "JENKINS_OPTS",
@@ -66,7 +66,7 @@
                         "value": "true"
                      }
                   ],
-                  "image": "docker.io/eclipsecbijenkins/adoptium.emt4j:2.479.2",
+                  "image": "docker.io/eclipsecbijenkins/adoptium.emt4j:2.492.2",
                   "imagePullPolicy": "Always",
                   "lifecycle": {
                      "preStop": {

instances/adoptium.mc/target/Dockerfile

@@ -1,4 +1,4 @@
-FROM docker.io/eclipsecbi/jiro-master:2.479.2
+FROM docker.io/eclipsecbi/jiro-master:2.492.2
 
 EXPOSE 8080
 EXPOSE 50000