Introduce CV test configuration

This allows configuring the JDK version to use for the cross-version
tests itself. For Gradle 9, we want to run the tests with both
Java 17 and Java 25.

Signed-off-by: Daniel Clausen <dclausen@gradle.com>

Author: snoopcheri

.teamcity/settings.kts

@@ -50,14 +50,43 @@ project {
         }
     }
 
-    val crossVersionTestLinuxGroup = listOf(5, 6, 7, 8, 9).map { gradleMajorVersion ->
-        val toolchainVersion = if(gradleMajorVersion >= 9) 17 else 8
-        buildType("CrossVersionTest Gradle $gradleMajorVersion.x Releases Linux - Java $toolchainVersion") {
+    data class CrossVersionTestConfiguration(
+        val gradleMajorVersion: Int,
+        val javaToolchainVersion: Int,
+        val testJavaToolchainVersion: Int?,
+    ) {
+        constructor(gradleMajorVersion: Int, testJavaToolchainVersion: Int) : this(
+            gradleMajorVersion,
+            if(gradleMajorVersion >= 9) 17 else 8,
+            testJavaToolchainVersion,
+        )
+
+        constructor(gradleMajorVersion: Int) : this(
+            gradleMajorVersion,
+            if(gradleMajorVersion >= 9) 17 else 8,
+            null,
+        )
+    }
+
+    val crossVersionGroupConfigs = listOf(
+        CrossVersionTestConfiguration(gradleMajorVersion = 5),
+        CrossVersionTestConfiguration(gradleMajorVersion = 6),
+        CrossVersionTestConfiguration(gradleMajorVersion = 7),
+        CrossVersionTestConfiguration(gradleMajorVersion = 8),
+        CrossVersionTestConfiguration(gradleMajorVersion = 9),
+        CrossVersionTestConfiguration(gradleMajorVersion = 9, testJavaToolchainVersion = 25),
+    )
+
+    val crossVersionTestLinuxGroups = crossVersionGroupConfigs.map { config ->
+        val testConfig = if (config.testJavaToolchainVersion == null) "" else " (tests use Java ${config.testJavaToolchainVersion})"
+        buildType("CrossVersionTest Gradle ${config.gradleMajorVersion}.x Releases Linux - Java ${config.javaToolchainVersion}${testConfig}") {
+            val javaToolchainVersionParameter = "-PjavaToolchainVersion=${config.javaToolchainVersion}"
+            val testJavaToolchainVersionParameter = if (config.testJavaToolchainVersion == null) "" else "-PtestJavaToolchainVersion=${config.testJavaToolchainVersion}"
             steps {
                 gradle {
-                    tasks = "clean testGradle${gradleMajorVersion}Releases"
+                    tasks = "clean testGradle${config.gradleMajorVersion}Releases"
                     buildFile = ""
-                    gradleParams = "-s $useGradleInternalScansServer $buildCacheSetup -PjavaToolchainVersion=$toolchainVersion"
+                    gradleParams = "-s $useGradleInternalScansServer $buildCacheSetup $javaToolchainVersionParameter $testJavaToolchainVersionParameter"
                     param("org.jfrog.artifactory.selectedDeployableServer.defaultModuleVersionConfiguration", "GLOBAL")
                 }
             }
@@ -109,7 +138,7 @@ project {
                 onDependencyFailure = FailureAction.CANCEL
                 onDependencyCancel = FailureAction.CANCEL
             }
-            crossVersionTestLinuxGroup.map {
+            crossVersionTestLinuxGroups.map {
                 snapshot(it) {
                     onDependencyFailure = FailureAction.CANCEL
                     onDependencyCancel = FailureAction.CANCEL

gradle.properties

@@ -3,7 +3,7 @@ org.gradle.parallel=true
 org.gradle.caching=true
 org.gradle.java.installations.auto-detect=false
 org.gradle.java.installations.auto-download=false
-org.gradle.java.installations.fromEnv=JDK8,JDK17
+org.gradle.java.installations.fromEnv=JDK8,JDK17,JDK25
 systemProp.org.gradle.kotlin.dsl.caching.buildcache=true
 systemProp.scan.capture-file-fingerprints=true
 systemProp.org.gradle.groovy.compilation.avoidance=true

plugin/build.gradle.kts

@@ -172,6 +172,11 @@ tasks.withType<Test> {
     systemProperty("spock1Version", libs.versions.spock1.get())
     systemProperty("spock2Version", if (isGradle9OrNewer) libs.versions.spock2.groovy4.get() else libs.versions.spock2.groovy3.get())
     systemProperty("testNgVersion", libs.versions.testNg.get())
+
+    if (project.hasProperty("testJavaToolchainVersion")) {
+        val testJavaToolchainVersion = project.property("testJavaToolchainVersion").toString()
+        systemProperty("testJavaToolchainVersion", testJavaToolchainVersion)
+    }
 }
 
 listOf(5, 6, 7, 8, 9).map { gradleMajorVersion ->

plugin/src/test/groovy/org/gradle/testretry/AbstractPluginFuncTest.groovy

@@ -126,9 +126,30 @@ abstract class AbstractPluginFuncTest extends Specification implements TestFrame
                     events "passed", "skipped", "failed"
                 }
             }
+
+            ${jdkConfigurationForTest()}
         """
     }
 
+    String jdkConfigurationForTest() {
+        def maybeTestJdkVersion = testJavaToolchainVersion()
+
+        if (maybeTestJdkVersion.present) {
+            def testJdkVersion = maybeTestJdkVersion.get()
+            println "Test runs with JDK ${testJdkVersion}"
+
+            """
+                java {
+                    toolchain {
+                        languageVersion = JavaLanguageVersion.of(${testJdkVersion})
+                    }
+                }            
+            """
+        } else {
+            return ""
+        }
+   }
+
     abstract String getLanguagePlugin()
 
     String baseBuildScriptWithoutPlugin() {
@@ -223,6 +244,11 @@ abstract class AbstractPluginFuncTest extends Specification implements TestFrame
         true
     }
 
+    Optional<Integer> testJavaToolchainVersion() {
+        Optional.ofNullable(System.getProperty("testJavaToolchainVersion"))
+            .map(s -> s.toInteger())
+    }
+
     static private List<String> gradleVersionsUnderTest() {
         def explicitGradleVersions = System.getProperty('org.gradle.test.gradleVersions')
         if (explicitGradleVersions) {