diff --git a/instances/adoptium.temurin-compliance/jenkins/configuration.yml b/instances/adoptium.temurin-compliance/jenkins/configuration.yml index 32bbc8605..900bdf3d7 100644 --- a/instances/adoptium.temurin-compliance/jenkins/configuration.yml +++ b/instances/adoptium.temurin-compliance/jenkins/configuration.yml @@ -200,8 +200,8 @@ jenkins: retentionStrategy: "always" launcher: ssh: - host: "services-uswest.skytap.com" - port: "24828" + host: "services-us-texas-m-1.skytap.com" + port: "8373" credentialsId: "jenkins-jck-ssh" javaPath: "/usr/jdk-17.0.12+6/bin/java" jvmOptions: "-Xmx1g -XX:-HeapDumpOnOutOfMemoryError -XX:-CreateCoredumpOnCrash" @@ -218,8 +218,8 @@ jenkins: retentionStrategy: "always" launcher: ssh: - host: "services-uswest.skytap.com" - port: "24845" + host: "services-us-texas-m-1.skytap.com" + port: "8523" credentialsId: "jenkins-jck-ssh" javaPath: "/usr/jdk-17.0.12+6/bin/java" jvmOptions: "-Xmx1g -XX:-HeapDumpOnOutOfMemoryError -XX:-CreateCoredumpOnCrash" @@ -236,8 +236,8 @@ jenkins: retentionStrategy: "always" launcher: ssh: - host: "services-uswest.skytap.com" - port: "24860" + host: "services-us-texas-m-1.skytap.com" + port: "8517" credentialsId: "jenkins-jck-ssh" javaPath: "/usr/jdk-17.0.12+6/bin/java" jvmOptions: "-Xmx1g -XX:-HeapDumpOnOutOfMemoryError -XX:-CreateCoredumpOnCrash" diff --git a/instances/adoptium.temurin-compliance/target/config.json b/instances/adoptium.temurin-compliance/target/config.json index 4ef65b0c3..2a41d4d0d 100644 --- a/instances/adoptium.temurin-compliance/target/config.json +++ b/instances/adoptium.temurin-compliance/target/config.json @@ -477,6 +477,7 @@ "pipeline-maven", "pipeline-stage-view", "pipeline-graph-view", + "plugin-usage-plugin", "prometheus", "promoted-builds", "rebuild", diff --git a/instances/adoptium.temurin-compliance/target/jenkins/configuration.yml b/instances/adoptium.temurin-compliance/target/jenkins/configuration.yml index 60bd492cd..917df00f3 100644 --- a/instances/adoptium.temurin-compliance/target/jenkins/configuration.yml +++ b/instances/adoptium.temurin-compliance/target/jenkins/configuration.yml @@ -550,8 +550,8 @@ jenkins: retentionStrategy: "always" launcher: ssh: - host: "services-uswest.skytap.com" - port: "24828" + host: "services-us-texas-m-1.skytap.com" + port: "8373" credentialsId: "jenkins-jck-ssh" javaPath: "/usr/jdk-17.0.12+6/bin/java" jvmOptions: "-Xmx1g -XX:-HeapDumpOnOutOfMemoryError -XX:-CreateCoredumpOnCrash" @@ -568,8 +568,8 @@ jenkins: retentionStrategy: "always" launcher: ssh: - host: "services-uswest.skytap.com" - port: "24845" + host: "services-us-texas-m-1.skytap.com" + port: "8523" credentialsId: "jenkins-jck-ssh" javaPath: "/usr/jdk-17.0.12+6/bin/java" jvmOptions: "-Xmx1g -XX:-HeapDumpOnOutOfMemoryError -XX:-CreateCoredumpOnCrash" @@ -586,8 +586,8 @@ jenkins: retentionStrategy: "always" launcher: ssh: - host: "services-uswest.skytap.com" - port: "24860" + host: "services-us-texas-m-1.skytap.com" + port: "8517" credentialsId: "jenkins-jck-ssh" javaPath: "/usr/jdk-17.0.12+6/bin/java" jvmOptions: "-Xmx1g -XX:-HeapDumpOnOutOfMemoryError -XX:-CreateCoredumpOnCrash" @@ -1053,6 +1053,8 @@ tool: home: "/opt/tools/java/openjdk/latest" - name: "openjdk-ea-latest" home: "/opt/tools/java/openjdk/ea-latest" + - name: "openjdk-jdk26-latest" + home: "/opt/tools/java/openjdk/jdk-26/latest" - name: "openjdk-jdk25-latest" home: "/opt/tools/java/openjdk/jdk-25/latest" - name: "openjdk-jdk24-latest" @@ -1133,6 +1135,8 @@ tool: home: "/opt/tools/java/adoptopenjdk/openj9-jdk-8/latest" - name: "temurin-latest" home: "/opt/tools/java/temurin/latest" + - name: "temurin-jdk25-latest" + home: "/opt/tools/java/temurin/jdk-25/latest" - name: "temurin-jdk24-latest" home: "/opt/tools/java/temurin/jdk-24/latest" - name: "temurin-jdk23-latest" @@ -1163,6 +1167,14 @@ tool: home: "/opt/tools/java/ibm/latest" - name: "semeru-latest" home: "/opt/tools/java/semeru/latest" + - name: "semeru-jdk25-latest" + home: "/opt/tools/java/semeru/jdk-25/latest" + - name: "semeru-jdk24-latest" + home: "/opt/tools/java/semeru/jdk-24/latest" + - name: "semeru-jdk23-latest" + home: "/opt/tools/java/semeru/jdk-23/latest" + - name: "semeru-jdk22-latest" + home: "/opt/tools/java/semeru/jdk-22/latest" - name: "semeru-jdk21-latest" home: "/opt/tools/java/semeru/jdk-21/latest" - name: "semeru-jdk20-latest" diff --git a/instances/adoptium.temurin-compliance/target/k8s/configmap-jenkins-config.yml b/instances/adoptium.temurin-compliance/target/k8s/configmap-jenkins-config.yml index 8db08b838..07a4734c7 100644 --- a/instances/adoptium.temurin-compliance/target/k8s/configmap-jenkins-config.yml +++ b/instances/adoptium.temurin-compliance/target/k8s/configmap-jenkins-config.yml @@ -573,8 +573,8 @@ data: retentionStrategy: "always" launcher: ssh: - host: "services-uswest.skytap.com" - port: "24828" + host: "services-us-texas-m-1.skytap.com" + port: "8373" credentialsId: "jenkins-jck-ssh" javaPath: "/usr/jdk-17.0.12+6/bin/java" jvmOptions: "-Xmx1g -XX:-HeapDumpOnOutOfMemoryError -XX:-CreateCoredumpOnCrash" @@ -591,8 +591,8 @@ data: retentionStrategy: "always" launcher: ssh: - host: "services-uswest.skytap.com" - port: "24845" + host: "services-us-texas-m-1.skytap.com" + port: "8523" credentialsId: "jenkins-jck-ssh" javaPath: "/usr/jdk-17.0.12+6/bin/java" jvmOptions: "-Xmx1g -XX:-HeapDumpOnOutOfMemoryError -XX:-CreateCoredumpOnCrash" @@ -609,8 +609,8 @@ data: retentionStrategy: "always" launcher: ssh: - host: "services-uswest.skytap.com" - port: "24860" + host: "services-us-texas-m-1.skytap.com" + port: "8517" credentialsId: "jenkins-jck-ssh" javaPath: "/usr/jdk-17.0.12+6/bin/java" jvmOptions: "-Xmx1g -XX:-HeapDumpOnOutOfMemoryError -XX:-CreateCoredumpOnCrash" @@ -1076,6 +1076,8 @@ data: home: "/opt/tools/java/openjdk/latest" - name: "openjdk-ea-latest" home: "/opt/tools/java/openjdk/ea-latest" + - name: "openjdk-jdk26-latest" + home: "/opt/tools/java/openjdk/jdk-26/latest" - name: "openjdk-jdk25-latest" home: "/opt/tools/java/openjdk/jdk-25/latest" - name: "openjdk-jdk24-latest" @@ -1156,6 +1158,8 @@ data: home: "/opt/tools/java/adoptopenjdk/openj9-jdk-8/latest" - name: "temurin-latest" home: "/opt/tools/java/temurin/latest" + - name: "temurin-jdk25-latest" + home: "/opt/tools/java/temurin/jdk-25/latest" - name: "temurin-jdk24-latest" home: "/opt/tools/java/temurin/jdk-24/latest" - name: "temurin-jdk23-latest" @@ -1186,6 +1190,14 @@ data: home: "/opt/tools/java/ibm/latest" - name: "semeru-latest" home: "/opt/tools/java/semeru/latest" + - name: "semeru-jdk25-latest" + home: "/opt/tools/java/semeru/jdk-25/latest" + - name: "semeru-jdk24-latest" + home: "/opt/tools/java/semeru/jdk-24/latest" + - name: "semeru-jdk23-latest" + home: "/opt/tools/java/semeru/jdk-23/latest" + - name: "semeru-jdk22-latest" + home: "/opt/tools/java/semeru/jdk-22/latest" - name: "semeru-jdk21-latest" home: "/opt/tools/java/semeru/jdk-21/latest" - name: "semeru-jdk20-latest" diff --git a/instances/adoptium.temurin-compliance/target/k8s/m2-dir.json b/instances/adoptium.temurin-compliance/target/k8s/m2-dir.json index 89864d797..a448ae6b4 100644 --- a/instances/adoptium.temurin-compliance/target/k8s/m2-dir.json +++ b/instances/adoptium.temurin-compliance/target/k8s/m2-dir.json @@ -2,7 +2,7 @@ "apiVersion": "v1", "data": { ".mavenrc": "set -- -V -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn --batch-mode \"${@}\"", - "toolchains.xml": "\n\n \n jdk\n \n JavaSE-1.8\n 1.8\n oracle\n \n /opt/tools/java/oracle/jdk-8/latest\n \n \n jdk\n \n JavaSE-9\n 9\n openjdk\n \n /opt/tools/java/openjdk/jdk-9/latest\n \n \n jdk\n \n JavaSE-10\n 10\n openjdk\n \n /opt/tools/java/openjdk/jdk-10/latest\n \n \n jdk\n \n JavaSE-11\n 11\n openjdk\n \n /opt/tools/java/openjdk/jdk-11/latest\n \n \n jdk\n \n JavaSE-12\n 12\n openjdk\n \n /opt/tools/java/openjdk/jdk-12/latest\n \n \n jdk\n \n JavaSE-13\n 13\n openjdk\n \n /opt/tools/java/openjdk/jdk-13/latest\n \n \n jdk\n \n JavaSE-14\n 14\n openjdk\n \n /opt/tools/java/openjdk/jdk-14/latest\n \n \n jdk\n \n JavaSE-15\n 15\n openjdk\n \n /opt/tools/java/openjdk/jdk-15/latest\n \n \n jdk\n \n JavaSE-16\n 16\n openjdk\n \n /opt/tools/java/openjdk/jdk-16/latest\n \n \n jdk\n \n JavaSE-17\n 17\n openjdk\n \n /opt/tools/java/openjdk/jdk-17/latest\n \n \n jdk\n \n JavaSE-18\n 18\n openjdk\n \n /opt/tools/java/openjdk/jdk-18/latest\n \n \n jdk\n \n JavaSE-19\n 19\n openjdk\n \n /opt/tools/java/openjdk/jdk-19/latest\n \n \n jdk\n \n JavaSE-20\n 20\n openjdk\n \n /opt/tools/java/openjdk/jdk-20/latest\n \n \n jdk\n \n JavaSE-21\n 21\n openjdk\n \n /opt/tools/java/openjdk/jdk-21/latest\n \n \n jdk\n \n JavaSE-22\n 22\n openjdk\n \n /opt/tools/java/openjdk/jdk-22/latest\n \n \n jdk\n \n JavaSE-23\n 23\n openjdk\n \n /opt/tools/java/openjdk/jdk-23/latest\n \n \n jdk\n \n JavaSE-24\n 24\n openjdk\n \n /opt/tools/java/openjdk/jdk-24/latest\n \n \n jdk\n \n JavaSE-25\n 25\n openjdk\n \n /opt/tools/java/openjdk/jdk-25/latest\n \n\n" + "toolchains.xml": "\n\n \n jdk\n \n JavaSE-1.8\n 1.8\n oracle\n \n /opt/tools/java/oracle/jdk-8/latest\n \n \n jdk\n \n JavaSE-9\n 9\n openjdk\n \n /opt/tools/java/openjdk/jdk-9/latest\n \n \n jdk\n \n JavaSE-10\n 10\n openjdk\n \n /opt/tools/java/openjdk/jdk-10/latest\n \n \n jdk\n \n JavaSE-11\n 11\n openjdk\n \n /opt/tools/java/openjdk/jdk-11/latest\n \n \n jdk\n \n JavaSE-12\n 12\n openjdk\n \n /opt/tools/java/openjdk/jdk-12/latest\n \n \n jdk\n \n JavaSE-13\n 13\n openjdk\n \n /opt/tools/java/openjdk/jdk-13/latest\n \n \n jdk\n \n JavaSE-14\n 14\n openjdk\n \n /opt/tools/java/openjdk/jdk-14/latest\n \n \n jdk\n \n JavaSE-15\n 15\n openjdk\n \n /opt/tools/java/openjdk/jdk-15/latest\n \n \n jdk\n \n JavaSE-16\n 16\n openjdk\n \n /opt/tools/java/openjdk/jdk-16/latest\n \n \n jdk\n \n JavaSE-17\n 17\n openjdk\n \n /opt/tools/java/openjdk/jdk-17/latest\n \n \n jdk\n \n JavaSE-18\n 18\n openjdk\n \n /opt/tools/java/openjdk/jdk-18/latest\n \n \n jdk\n \n JavaSE-19\n 19\n openjdk\n \n /opt/tools/java/openjdk/jdk-19/latest\n \n \n jdk\n \n JavaSE-20\n 20\n openjdk\n \n /opt/tools/java/openjdk/jdk-20/latest\n \n \n jdk\n \n JavaSE-21\n 21\n openjdk\n \n /opt/tools/java/openjdk/jdk-21/latest\n \n \n jdk\n \n JavaSE-22\n 22\n openjdk\n \n /opt/tools/java/openjdk/jdk-22/latest\n \n \n jdk\n \n JavaSE-23\n 23\n openjdk\n \n /opt/tools/java/openjdk/jdk-23/latest\n \n \n jdk\n \n JavaSE-24\n 24\n openjdk\n \n /opt/tools/java/openjdk/jdk-24/latest\n \n \n jdk\n \n JavaSE-25\n 25\n openjdk\n \n /opt/tools/java/openjdk/jdk-25/latest\n \n \n jdk\n \n JavaSE-26\n 26\n openjdk\n \n /opt/tools/java/openjdk/jdk-26/latest\n \n\n" }, "kind": "ConfigMap", "metadata": {