Mute watcher rolling upgrade yaml tests (#81935)

Relates to #81110
elastic · Dec 21, 2021 · bbd08e2 · bbd08e2
1 parent d46ccb0
commit bbd08e2
Show file tree

Hide file tree

Showing 4 changed files with 27 additions and 10 deletions.
diff --git a/...upgrade/src/test/java/org/elasticsearch/upgrades/UpgradeClusterClientYamlTestSuiteIT.java b/...upgrade/src/test/java/org/elasticsearch/upgrades/UpgradeClusterClientYamlTestSuiteIT.java
@@ -11,8 +11,6 @@
 
 import org.apache.lucene.util.TimeUnits;
 import org.elasticsearch.Version;
-import org.elasticsearch.client.Request;
-import org.elasticsearch.client.Response;
 import org.elasticsearch.common.settings.Settings;
 import org.elasticsearch.common.util.concurrent.ThreadContext;
 import org.elasticsearch.test.rest.ESRestTestCase;
@@ -24,12 +22,6 @@
 
 import java.nio.charset.StandardCharsets;
 import java.util.Base64;
-import java.util.List;
-import java.util.Map;
-import java.util.concurrent.TimeUnit;
-
-import static org.hamcrest.Matchers.equalTo;
-import static org.hamcrest.Matchers.greaterThanOrEqualTo;
 
 @TimeoutSuite(millis = 5 * TimeUnits.MINUTE) // to account for slow as hell VMs
 public class UpgradeClusterClientYamlTestSuiteIT extends ESClientYamlSuiteTestCase {
@@ -55,7 +47,8 @@ public void waitForTemplates() throws Exception {
         }
     }
 
-    @Before
+    /*@Before
+    // AwaitFix=https://github.com/elastic/elasticsearch/issues/81110
     public void waitForWatcher() throws Exception {
         // Wait for watcher to be in started state in order to avoid errors due
         // to manually executing watches prior for watcher to be ready:
@@ -73,7 +66,7 @@ public void waitForWatcher() throws Exception {
         } catch (AssertionError e) {
             throw new AssertionError("Failure in test setup: Failed to initialize at least 3 watcher nodes", e);
         }
-    }
+    }*/
 
     @Override
     protected boolean preserveIndicesUponCompletion() {

diff --git a/x-pack/qa/rolling-upgrade/src/test/resources/rest-api-spec/test/mixed_cluster/60_watcher.yml b/x-pack/qa/rolling-upgrade/src/test/resources/rest-api-spec/test/mixed_cluster/60_watcher.yml
@@ -1,5 +1,8 @@
 ---
 "CRUD watch APIs":
+  - skip:
+      version: "all"
+      reason: "https://github.com/elastic/elasticsearch/issues/81110"
   # no need to put watch, exists already
   - do:
       watcher.get_watch:
@@ -72,3 +75,8 @@
       watcher.stats: {}
   - match: { "manually_stopped": false }
   - match: { "stats.0.watcher_state": "started" }
+
+---
+"Test do something":
+  - do: { ping: { } }
+  - is_true: ''
diff --git a/x-pack/qa/rolling-upgrade/src/test/resources/rest-api-spec/test/old_cluster/60_watcher.yml b/x-pack/qa/rolling-upgrade/src/test/resources/rest-api-spec/test/old_cluster/60_watcher.yml
@@ -1,5 +1,8 @@
 ---
 "CRUD watch APIs":
+  - skip:
+      version: "all"
+      reason: "https://github.com/elastic/elasticsearch/issues/81110"
   - do:
       watcher.put_watch:
         id: "my_watch"
@@ -101,3 +104,8 @@
       watcher.stats: {}
   - match: { "manually_stopped": false }
   - match: { "stats.0.watcher_state": "started" }
+
+---
+"Test do something":
+  - do: { ping: { } }
+  - is_true: ''
diff --git a/.../qa/rolling-upgrade/src/test/resources/rest-api-spec/test/upgraded_cluster/60_watcher.yml b/.../qa/rolling-upgrade/src/test/resources/rest-api-spec/test/upgraded_cluster/60_watcher.yml
@@ -1,5 +1,8 @@
 ---
 "CRUD watch APIs":
+  - skip:
+      version: "all"
+      reason: "https://github.com/elastic/elasticsearch/issues/81110"
   # no need to put watch, exists already
   - do:
       watcher.get_watch:
@@ -73,3 +76,8 @@
       watcher.stats: {}
   - match: { "manually_stopped": false }
   - match: { "stats.0.watcher_state": "started" }
+
+---
+"Test do something":
+  - do: { ping: { } }
+  - is_true: ''