From 818a2662aca4ea53b440c862d5708f6785d04ce4 Mon Sep 17 00:00:00 2001 From: Brian Seeders Date: Thu, 6 Mar 2025 12:57:28 -0500 Subject: [PATCH 1/3] [CI] Disable multi-project tests in non-snapshot build tests --- test/external-modules/multi-project/build.gradle | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/test/external-modules/multi-project/build.gradle b/test/external-modules/multi-project/build.gradle index aa0b45242c27d..5970226d1ef87 100644 --- a/test/external-modules/multi-project/build.gradle +++ b/test/external-modules/multi-project/build.gradle @@ -17,3 +17,7 @@ dependencies { tasks.withType(StandaloneRestIntegTestTask).configureEach { usesDefaultDistribution() } + +tasks.named("javaRestTest").configure { + enabled = buildParams.snapshotBuild +} From c04b827eefb8e27cd7e1e46bddb71152ef53fe41 Mon Sep 17 00:00:00 2001 From: Brian Seeders Date: Thu, 6 Mar 2025 14:01:31 -0500 Subject: [PATCH 2/3] Disable more multiproject tests --- x-pack/qa/multi-project/build.gradle | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/x-pack/qa/multi-project/build.gradle b/x-pack/qa/multi-project/build.gradle index 358b47008b534..2425467ef66fa 100644 --- a/x-pack/qa/multi-project/build.gradle +++ b/x-pack/qa/multi-project/build.gradle @@ -3,4 +3,8 @@ subprojects { apply plugin: 'elasticsearch.bwc-test' group = 'org.elasticsearch.qa.multi-project' + + tasks.named { it == "javaRestTest" || it == "yamlRestTest" }.configureEach { + it.onlyIf("snapshot build") { buildParams.snapshotBuild } + } } From e55b81b7425e0fda82dd989f69ecc065f4f812e3 Mon Sep 17 00:00:00 2001 From: Brian Seeders Date: Thu, 6 Mar 2025 14:09:52 -0500 Subject: [PATCH 3/3] Disable more multiproject tests --- x-pack/plugin/security/qa/multi-project/build.gradle | 1 + 1 file changed, 1 insertion(+) diff --git a/x-pack/plugin/security/qa/multi-project/build.gradle b/x-pack/plugin/security/qa/multi-project/build.gradle index b6b345786d9b7..d04b018d3abec 100644 --- a/x-pack/plugin/security/qa/multi-project/build.gradle +++ b/x-pack/plugin/security/qa/multi-project/build.gradle @@ -6,4 +6,5 @@ dependencies { tasks.named('javaRestTest') { usesDefaultDistribution() + it.onlyIf("snapshot build") { buildParams.snapshotBuild } }