From 1f6bffaa30ba5f71d8d93a4e92e56286349ef16c Mon Sep 17 00:00:00 2001
From: Kostas Krikellas <131142368+kkrik-es@users.noreply.github.com>
Date: Fri, 13 Oct 2023 15:08:50 +0300
Subject: [PATCH] Restore version skipping for position fields (#100817)

* Don't print synthetic source in mapping for bwc tests

* Move comment.

* Don't print synthetic source in mapping for bwc tests #2

* Don't print synthetic source in mapping for bwc tests #2

* Revert "Don't print synthetic source in mapping for bwc tests #2"

This reverts commit 034262c5d22229aa6e8a0b7e754fd806a521cfc4.

* Revert "Don't print synthetic source in mapping for bwc tests #2"

This reverts commit 44e815635e2565c0b042cfe558a7451226c89488.

* Revert "Don't print synthetic source in mapping for bwc tests (#100572)"

This reverts commit 9322ab9b9163f70c9bf832f1b0a1985121393cfe.

* Exclude synthetic source test from mixedClusterTests

* Update comment.

* Mute all tsdb tests in mixedClusterTests

This is an interim step to stop sporadic test failures, while we try to
fix version skip for mixed cluster tests.

* Remove old exclusion

* Add aggregations too

* Mute tests for versions between 8.7-8.10

* Remove mute

* Restore version skipping for position fields

* Restore version skip for synthetic source
---
 .../resources/rest-api-spec/test/tsdb/130_position_fields.yml | 4 ++--
 .../resources/rest-api-spec/test/tsdb/20_mapping.yml          | 4 ++++
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/tsdb/130_position_fields.yml b/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/tsdb/130_position_fields.yml
index fa7a5ae1449a9..cb897c918305e 100644
--- a/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/tsdb/130_position_fields.yml
+++ b/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/tsdb/130_position_fields.yml
@@ -1,8 +1,8 @@
 ---
 setup:
   - skip:
-      version: "8.7.00 - 8.9.99"
-      reason: "Synthetic source shows up in the mapping in 8.10 and on, may trigger assert failures in mixed cluster tests"
+      version: " - 8.9.99"
+      reason: "position metric introduced in 8.8.0, synthetic source shows up in the mapping in 8.10 and on, may trigger assert failures in mixed cluster tests"
 
   - do:
       indices.create:
diff --git a/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/tsdb/20_mapping.yml b/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/tsdb/20_mapping.yml
index e4963832ddce3..3d297e2181970 100644
--- a/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/tsdb/20_mapping.yml
+++ b/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/tsdb/20_mapping.yml
@@ -424,6 +424,10 @@ nested fields:
 
 ---
 "Synthetic source":
+  - skip:
+      version: " - 8.9.99"
+      reason: Synthetic source shows up in the mapping in 8.10
+
   - do:
       indices.create:
         index: tsdb-synthetic