Skip to content

Commit 7018005

Browse files
authored
[Gradle] Wire java toolchain plugin into integration tests (#125347) (#125464)
* [Gradle] Wire java toolchain plugin into integration tests This addresses transient issues we see in the integration tests where previously resolved jdk toolchain is not available. See https://gradle-enterprise.elastic.co/s/66msrp7n2nsdy/tests/task/:build-tools-internal:integTest/details/org.elasticsearch.gradle.internal.test.rest.LegacyYamlRestTestPluginFuncTest/yamlRestTest%20executes%20and%20copies%20api%20and%20tests%20to%20correct%20source%20set\?top-execution\=1 for example * Fix fix
1 parent 3536c6d commit 7018005

File tree

1 file changed

+16
-0
lines changed

1 file changed

+16
-0
lines changed

build-tools-internal/src/integTest/groovy/org/elasticsearch/gradle/fixtures/AbstractGradleInternalPluginFuncTest.groovy

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,22 @@ abstract class AbstractGradleInternalPluginFuncTest extends AbstractJavaGradleFu
2020
plugins {
2121
id 'elasticsearch.java-toolchain'
2222
}
23+
24+
toolchainManagement {
25+
jvm {
26+
javaRepositories {
27+
repository('bundledOracleOpendJdk') {
28+
resolverClass = org.elasticsearch.gradle.internal.toolchain.OracleOpenJdkToolchainResolver
29+
}
30+
repository('adoptiumJdks') {
31+
resolverClass = org.elasticsearch.gradle.internal.toolchain.AdoptiumJdkToolchainResolver
32+
}
33+
repository('archivedOracleJdks') {
34+
resolverClass = org.elasticsearch.gradle.internal.toolchain.ArchivedOracleJdkToolchainResolver
35+
}
36+
}
37+
}
38+
}
2339
""" + settingsFile.text
2440

2541
buildFile << """

0 commit comments

Comments
 (0)