From 997f35e642241e879a668ea3a489816d12b084c9 Mon Sep 17 00:00:00 2001 From: Rene Groeschke Date: Mon, 31 Mar 2025 19:23:45 +0200 Subject: [PATCH] [CI] Fix LegacyYamlRestTestPluginFuncTest failure for not available java toolchain Wire in toolchain plugins into AbstractRestResourcesFuncTest to allow resolving jdk --- .../AbstractRestResourcesFuncTest.groovy | 21 +++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/build-tools-internal/src/integTest/groovy/org/elasticsearch/gradle/fixtures/AbstractRestResourcesFuncTest.groovy b/build-tools-internal/src/integTest/groovy/org/elasticsearch/gradle/fixtures/AbstractRestResourcesFuncTest.groovy index 1396272026abc..150f2b1130159 100644 --- a/build-tools-internal/src/integTest/groovy/org/elasticsearch/gradle/fixtures/AbstractRestResourcesFuncTest.groovy +++ b/build-tools-internal/src/integTest/groovy/org/elasticsearch/gradle/fixtures/AbstractRestResourcesFuncTest.groovy @@ -13,6 +13,27 @@ package org.elasticsearch.gradle.fixtures; abstract class AbstractRestResourcesFuncTest extends AbstractGradleFuncTest { def setup() { + settingsFile.text = """ + 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 subProject(":test:framework") << "apply plugin: 'elasticsearch.java'" subProject(":test:test-clusters") << "apply plugin: 'elasticsearch.java'" subProject(":test:yaml-rest-runner") << "apply plugin: 'elasticsearch.java'"