From 3db6f33b185c6c49adc66790ba51460ed4bd6cfe Mon Sep 17 00:00:00 2001 From: Quentin Pradet Date: Wed, 17 Sep 2025 10:57:24 +0400 Subject: [PATCH 1/2] Add streams YAML tests to restResourcesZip --- x-pack/rest-resources-zip/build.gradle | 1 + 1 file changed, 1 insertion(+) diff --git a/x-pack/rest-resources-zip/build.gradle b/x-pack/rest-resources-zip/build.gradle index ab684c8b0c367..64726beb5f068 100644 --- a/x-pack/rest-resources-zip/build.gradle +++ b/x-pack/rest-resources-zip/build.gradle @@ -22,6 +22,7 @@ dependencies { freeTests project(path: ':modules:analysis-common', configuration: 'restTests') freeTests project(path: ':modules:data-streams', configuration: 'restTests') freeTests project(path: ':modules:ingest-geoip', configuration: 'restTests') + freeTests project(path: ':modules:streams', configuration: 'basicRestSpecs') compatApis project(path: ':rest-api-spec', configuration: 'restCompatSpecs') compatApis project(path: ':x-pack:plugin', configuration: 'restCompatSpecs') freeCompatTests project(path: ':rest-api-spec', configuration: 'restCompatTests') From 50d03e1305ef77e3dd2f4be8148d3109f619db3d Mon Sep 17 00:00:00 2001 From: Quentin Pradet Date: Wed, 17 Sep 2025 20:41:30 +0400 Subject: [PATCH 2/2] Rename basicRestSpecs to restTests --- modules/streams/build.gradle | 4 ++-- .../core-rest-tests-with-multiple-projects/build.gradle | 2 +- x-pack/rest-resources-zip/build.gradle | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/modules/streams/build.gradle b/modules/streams/build.gradle index 4255221db4747..505c788f8c77f 100644 --- a/modules/streams/build.gradle +++ b/modules/streams/build.gradle @@ -25,7 +25,7 @@ restResources { } configurations { - basicRestSpecs { + restTests { attributes { attribute(ArtifactTypeDefinition.ARTIFACT_TYPE_ATTRIBUTE, ArtifactTypeDefinition.DIRECTORY_TYPE) } @@ -33,7 +33,7 @@ configurations { } artifacts { - basicRestSpecs(new File(projectDir, "src/yamlRestTest/resources/rest-api-spec/test")) + restTests(new File(projectDir, "src/yamlRestTest/resources/rest-api-spec/test")) } dependencies { diff --git a/x-pack/qa/multi-project/core-rest-tests-with-multiple-projects/build.gradle b/x-pack/qa/multi-project/core-rest-tests-with-multiple-projects/build.gradle index 9f52077199ca5..6684a94b8a02e 100644 --- a/x-pack/qa/multi-project/core-rest-tests-with-multiple-projects/build.gradle +++ b/x-pack/qa/multi-project/core-rest-tests-with-multiple-projects/build.gradle @@ -31,7 +31,7 @@ dependencies { restTestConfig project(path: ':modules:data-streams', configuration: "restTests") restTestConfig project(path: ':modules:ingest-common', configuration: "basicRestSpecs") restTestConfig project(path: ':modules:reindex', configuration: "basicRestSpecs") - restTestConfig project(path: ':modules:streams', configuration: "basicRestSpecs") + restTestConfig project(path: ':modules:streams', configuration: "restTests") } // let the yamlRestTests see the classpath of test diff --git a/x-pack/rest-resources-zip/build.gradle b/x-pack/rest-resources-zip/build.gradle index 64726beb5f068..18b3d71957f1c 100644 --- a/x-pack/rest-resources-zip/build.gradle +++ b/x-pack/rest-resources-zip/build.gradle @@ -22,7 +22,7 @@ dependencies { freeTests project(path: ':modules:analysis-common', configuration: 'restTests') freeTests project(path: ':modules:data-streams', configuration: 'restTests') freeTests project(path: ':modules:ingest-geoip', configuration: 'restTests') - freeTests project(path: ':modules:streams', configuration: 'basicRestSpecs') + freeTests project(path: ':modules:streams', configuration: 'restTests') compatApis project(path: ':rest-api-spec', configuration: 'restCompatSpecs') compatApis project(path: ':x-pack:plugin', configuration: 'restCompatSpecs') freeCompatTests project(path: ':rest-api-spec', configuration: 'restCompatTests')