diff --git a/JenkinsJobs/AutomatedTests/I_unit_linux.groovy b/JenkinsJobs/AutomatedTests/I_unit_linux.groovy index c5079a4d58b..d51939bb49f 100644 --- a/JenkinsJobs/AutomatedTests/I_unit_linux.groovy +++ b/JenkinsJobs/AutomatedTests/I_unit_linux.groovy @@ -1,9 +1,8 @@ def config = new groovy.json.JsonSlurper().parseText(readFileFromWorkspace('JenkinsJobs/JobDSL.json')) def STREAMS = config.Streams -def JAVA_VERSIONS = ['17', '21', '23'] +def JAVA_VERSIONS = ['21', '23'] def BUILD_CONFIGURATIONS = [ - [javaVersion: 17, javaHome: "tool(type:'jdk', name:'openjdk-jdk17-latest')" ], [javaVersion: 21, javaHome: "tool(type:'jdk', name:'openjdk-jdk21-latest')" ], [javaVersion: 23, javaHome: "installJDK('23', 'linux', 'x86_64', 'ea')" ] ] diff --git a/JenkinsJobs/Builds/I_build.groovy b/JenkinsJobs/Builds/I_build.groovy index 6c700c8e217..68004cb99d8 100644 --- a/JenkinsJobs/Builds/I_build.groovy +++ b/JenkinsJobs/Builds/I_build.groovy @@ -73,7 +73,7 @@ spec: } } tools { - jdk 'temurin-jdk17-latest' + jdk 'temurin-jdk21-latest' } environment { MAVEN_OPTS = "-Xmx6G" diff --git a/JenkinsJobs/Builds/markStable.groovy b/JenkinsJobs/Builds/markStable.groovy index bc911a5f742..fdeefc59539 100644 --- a/JenkinsJobs/Builds/markStable.groovy +++ b/JenkinsJobs/Builds/markStable.groovy @@ -13,7 +13,7 @@ job('Builds/markStable'){ numToKeep(5) } - jdk('openjdk-jdk17-latest') + jdk('temurin-jdk21-latest') wrappers { //adds pre/post actions timestamps() diff --git a/JenkinsJobs/Builds/markUnstable.groovy b/JenkinsJobs/Builds/markUnstable.groovy index 3e728c16539..b492f024379 100644 --- a/JenkinsJobs/Builds/markUnstable.groovy +++ b/JenkinsJobs/Builds/markUnstable.groovy @@ -15,7 +15,7 @@ job('Builds/markUnstable'){ numToKeep(5) } - jdk('openjdk-jdk17-latest') + jdk('temurin-jdk21-latest') wrappers { //adds pre/post actions timestamps()