mirrors
/
elasticsearch
mirror of https://mirror.osredm.com/root/elasticsearch.git
2
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

[Gradle] Wire java toolchain plugin into integration tests (#125347) 

* [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
This commit is contained in:
Rene Groeschke 2025-03-23 19:11:24 +01:00 committed by GitHub
parent f7d7ce7ccc
commit 59a55c85f3
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 16 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -20,6 +20,22 @@ abstract class AbstractGradleInternalPluginFuncTest extends AbstractJavaGradleFu
plugins {
id 'elasticsearch.java-toolchain'
}
toolchainManagement {
jvm {
javaRepositories {
repository('bundledOracleOpendJdk') {
resolverClass = org.elasticsearch.gradle.internal.toolchain.OracleOpenJdkToolchainResolver
}
repository('adoptiumJdks') {
resolverClass = org.elasticsearch.gradle.internal.toolchain.AdoptiumJdkToolchainResolver
}
repository('archivedOracleJdks') {
resolverClass = org.elasticsearch.gradle.internal.toolchain.ArchivedOracleJdkToolchainResolver
}
}
}
}
""" + settingsFile.text
buildFile << """