From df405570dc76d07d26910fbbb38abe765d77f5cb Mon Sep 17 00:00:00 2001 From: Quentin Pradet Date: Wed, 2 Jul 2025 09:59:18 +0400 Subject: [PATCH 1/2] Add data-streams 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 6cc39aa168e91..a3d6808f5ecd2 100644 --- a/x-pack/rest-resources-zip/build.gradle +++ b/x-pack/rest-resources-zip/build.gradle @@ -20,6 +20,7 @@ dependencies { freeTests project(path: ':rest-api-spec', configuration: 'restTests') freeTests project(path: ':modules:aggregations', configuration: 'restTests') freeTests project(path: ':modules:analysis-common', configuration: 'restTests') + freeTests project(path: ':modules:data-streams', configuration: 'basicRestSpecs') freeTests project(path: ':modules:ingest-geoip', configuration: 'restTests') compatApis project(path: ':rest-api-spec', configuration: 'restCompatSpecs') compatApis project(path: ':x-pack:plugin', configuration: 'restCompatSpecs') From d453535d796b93af3490ca3f266c6a4c45109eb4 Mon Sep 17 00:00:00 2001 From: Quentin Pradet Date: Wed, 2 Jul 2025 17:53:33 +0400 Subject: [PATCH 2/2] Rename to restTests --- modules/data-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/data-streams/build.gradle b/modules/data-streams/build.gradle index b5fcae8115cd0..51bb04185cfde 100644 --- a/modules/data-streams/build.gradle +++ b/modules/data-streams/build.gradle @@ -87,7 +87,7 @@ tasks.named("yamlRestCompatTestTransform").configure({ task -> }) configurations { - basicRestSpecs { + restTests { attributes { attribute(ArtifactTypeDefinition.ARTIFACT_TYPE_ATTRIBUTE, ArtifactTypeDefinition.DIRECTORY_TYPE) } @@ -95,5 +95,5 @@ configurations { } artifacts { - basicRestSpecs(new File(projectDir, "src/yamlRestTest/resources/rest-api-spec/test")) + restTests(new File(projectDir, "src/yamlRestTest/resources/rest-api-spec/test")) } 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 2d33cccb00bee..806028183560b 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 @@ -28,7 +28,7 @@ dependencies { clusterModules project(xpackModule('mapper-constant-keyword')) clusterModules project(xpackModule('wildcard')) clusterModules project(':test:external-modules:test-multi-project') - restTestConfig project(path: ':modules:data-streams', configuration: "basicRestSpecs") + 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") diff --git a/x-pack/rest-resources-zip/build.gradle b/x-pack/rest-resources-zip/build.gradle index a3d6808f5ecd2..9f7dcc4b26c05 100644 --- a/x-pack/rest-resources-zip/build.gradle +++ b/x-pack/rest-resources-zip/build.gradle @@ -20,7 +20,7 @@ dependencies { freeTests project(path: ':rest-api-spec', configuration: 'restTests') freeTests project(path: ':modules:aggregations', configuration: 'restTests') freeTests project(path: ':modules:analysis-common', configuration: 'restTests') - freeTests project(path: ':modules:data-streams', configuration: 'basicRestSpecs') + freeTests project(path: ':modules:data-streams', configuration: 'restTests') freeTests project(path: ':modules:ingest-geoip', configuration: 'restTests') compatApis project(path: ':rest-api-spec', configuration: 'restCompatSpecs') compatApis project(path: ':x-pack:plugin', configuration: 'restCompatSpecs')