From c5b04311e095f4d7963b62ee9d9503dc765c067c Mon Sep 17 00:00:00 2001 From: Andrei Dan Date: Thu, 30 Apr 2020 17:02:08 +0100 Subject: [PATCH] Conditionally run tests asserting overlapping templates (#56028) (#56040) Only run the tests verifyin the overlapping index templates when there is no `global` index template (ie. when the default shards are not changed) (cherry picked from commit e256becad7650018ed6687d6f4ddba5e255f6b29) Signed-off-by: Andrei Dan --- .../test/indices.simulate_index_template/10_basic.yml | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/rest-api-spec/src/main/resources/rest-api-spec/test/indices.simulate_index_template/10_basic.yml b/rest-api-spec/src/main/resources/rest-api-spec/test/indices.simulate_index_template/10_basic.yml index 1fbb64a77a6..0a03a5bd926 100644 --- a/rest-api-spec/src/main/resources/rest-api-spec/test/indices.simulate_index_template/10_basic.yml +++ b/rest-api-spec/src/main/resources/rest-api-spec/test/indices.simulate_index_template/10_basic.yml @@ -3,11 +3,9 @@ - skip: version: " - 7.99.99" reason: "simulate index template API has not been backported" - features: allowed_warnings + features: ["default_shards"] - do: - allowed_warnings: - - "index template [test] has index patterns [te*] matching patterns from existing older templates [global] with patterns (global => [*]); this template [test] will take precedence during new index creation" indices.put_index_template: name: test body: @@ -35,11 +33,9 @@ - skip: version: " - 7.99.99" reason: "simulate index template API has not been backported" - features: allowed_warnings + features: ["default_shards"] - do: - allowed_warnings: - - "index template [test] has index patterns [te*] matching patterns from existing older templates [global] with patterns (global => [*]); this template [test] will take precedence during new index creation" indices.put_index_template: name: existing_test body: @@ -122,7 +118,7 @@ - skip: version: " - 7.99.99" reason: "simulate index template API has not been backported" - features: allowed_warnings + features: ["allowed_warnings", "default_shards"] - do: indices.put_template: