Merge pull request #465 from gradle/snoopcheri/configure-jdk-25

Fix for finding Java 25 toolchain in tests on CI

Author: snoopcheri

.teamcity/settings.kts

@@ -37,6 +37,7 @@ project {
     params {
         java8Home(Os.linux)
         java17Home(Os.linux)
+        java25Home(Os.linux)
         text("systemProp.org.gradle.internal.publish.checksums.insecure", "true")
     }
 

.teamcity/settings/extensions.kt

@@ -26,6 +26,11 @@ fun ParametrizedWithType.java17Home(os: Os) {
     param("env.JDK17", "%${os.name}.java17.openjdk.64bit%")
 }
 
+fun ParametrizedWithType.java25Home(os: Os) {
+    // Currently hard-coded for Linux
+    param("env.JDK25", "/opt/jdk/open-jdk-25")
+}
+
 const val useGradleInternalScansServer = "-I gradle/init-scripts/build-scan.init.gradle.kts"
 
 const val buildCacheSetup = "--build-cache -Dgradle.cache.remote.push=true"
@@ -57,6 +62,7 @@ fun Project.buildType(buildTypeName: String, init: BuildType.() -> Unit): BuildT
         params {
             java8Home(Os.linux)
             java17Home(Os.linux)
+            java25Home(Os.linux)
 
             param("env.GRADLE_CACHE_REMOTE_URL", "%gradle.cache.remote.url%")
             param("env.GRADLE_CACHE_REMOTE_USERNAME", "%gradle.cache.remote.username%")

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

@@ -37,11 +37,23 @@ abstract class AbstractPluginFuncTest extends Specification implements TestFrame
     @Rule
     TemporaryFolder testProjectDir = new TemporaryFolder()
 
+    File gradleProperties
+
     File settingsFile
 
     File buildFile
 
     def setup() {
+        gradleProperties = testProjectDir.newFile('gradle.properties')
+        testJavaToolchainVersion().ifPresent { major ->
+            // When a specific Java version is specified that tests should configure,
+            // we have to configure the build to allow finding the version via an env variable.
+            def expectedEnvVar = "JDK${major}"
+            assert (System.getenv(expectedEnvVar) != null) : "Test toolchain version is configured but env var ${expectedEnvVar} is missing!"
+
+            gradleProperties << "org.gradle.java.installations.fromEnv=${expectedEnvVar}"
+        }
+
         settingsFile = testProjectDir.newFile('settings.gradle')
         settingsFile << "rootProject.name = 'hello-world'"
         buildFile = testProjectDir.newFile('build.gradle')