From f7e208237826fe5ce50cb51fde25b5c5d05cba71 Mon Sep 17 00:00:00 2001
From: Martijn van Groningen <martijn.v.groningen@gmail.com>
Date: Thu, 30 Jan 2020 14:01:30 +0100
Subject: [PATCH] Backport: unmute rolling upgrade watcher tests and (#51664)

set watcher logger to debug level.

These tests haven't run in such a long time,
we first need to get a better picture how/if
these tests fail today.

Backport of #51478
See #33185
---
 x-pack/qa/rolling-upgrade/build.gradle          |  1 +
 .../test/mixed_cluster/60_watcher.yml           | 17 ++---------------
 .../test/old_cluster/60_watcher.yml             | 15 ++-------------
 .../test/upgraded_cluster/60_watcher.yml        | 15 ++-------------
 4 files changed, 7 insertions(+), 41 deletions(-)

diff --git a/x-pack/qa/rolling-upgrade/build.gradle b/x-pack/qa/rolling-upgrade/build.gradle
index 78b8f3e57dc..1b35bdeb66f 100644
--- a/x-pack/qa/rolling-upgrade/build.gradle
+++ b/x-pack/qa/rolling-upgrade/build.gradle
@@ -102,6 +102,7 @@ for (Version bwcVersion : bwcVersions.wireCompatible) {
       }
 
       javaHome = BuildParams.runtimeJavaHome
+      setting 'logger.org.elasticsearch.xpack.watcher', 'DEBUG'
     }
   }
 
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
index 2a1dd4397dc..b2176f8a7cd 100644
--- 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,10 +1,5 @@
 ---
 "CRUD watch APIs":
-
-  - skip:
-      reason: https://github.com/elastic/elasticsearch/issues/33185
-      version: "6.7.0 - "
-
   # no need to put watch, exists already
   - do:
       watcher.get_watch:
@@ -12,7 +7,6 @@
   - match: { found : true}
   - match: { _id: "my_watch" }
 
-
   # execute watch
   - do:
       watcher.execute_watch:
@@ -48,7 +42,7 @@
       watcher.deactivate_watch:
         watch_id: "my_watch"
   - match: { status.state.active : false }
-  
+
   - do:
       watcher.get_watch:
         id: "my_watch"
@@ -56,13 +50,12 @@
   - match: { _id: "my_watch" }
   - match: { status.state.active: false }
 
-
   # activate watch again, check with GET API as well
   - do:
       watcher.activate_watch:
         watch_id: "my_watch"
   - match: { status.state.active : true }
-  
+
   - do:
       watcher.get_watch:
         id: "my_watch"
@@ -70,14 +63,8 @@
   - match: { _id: "my_watch" }
   - match: { status.state.active: true }
 
-
 ---
 "Test watcher stats output":
-
-  - skip:
-      reason: https://github.com/elastic/elasticsearch/issues/33185
-      version: "6.7.0 - "
-
   - do:
       watcher.stats: {}
   - match: { "manually_stopped": false }
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
index aafb7ddf239..ef7b470b11e 100644
--- 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,9 +1,5 @@
 ---
 "CRUD watch APIs":
-  - skip:
-      reason: https://github.com/elastic/elasticsearch/issues/33185
-      version: "6.7.0 - "
-
   - do:
       watcher.put_watch:
         id: "my_watch"
@@ -31,7 +27,6 @@
   - match: { found : true}
   - match: { _id: "my_watch" }
 
-
   # execute watch
   - do:
       watcher.execute_watch:
@@ -67,7 +62,7 @@
       watcher.deactivate_watch:
         watch_id: "my_watch"
   - match: { status.state.active : false }
-  
+
   - do:
       watcher.get_watch:
         id: "my_watch"
@@ -81,7 +76,7 @@
       watcher.activate_watch:
         watch_id: "my_watch"
   - match: { status.state.active : true }
-  
+
   - do:
       watcher.get_watch:
         id: "my_watch"
@@ -89,14 +84,8 @@
   - match: { _id: "my_watch" }
   - match: { status.state.active: true }
 
-
 ---
 "Test watcher stats output":
-
-  - skip:
-      reason: https://github.com/elastic/elasticsearch/issues/33185
-      version: "6.7.0 - "
-
   - do:
       watcher.stats: {}
   - match: { "manually_stopped": false }
diff --git a/x-pack/qa/rolling-upgrade/src/test/resources/rest-api-spec/test/upgraded_cluster/60_watcher.yml b/x-pack/qa/rolling-upgrade/src/test/resources/rest-api-spec/test/upgraded_cluster/60_watcher.yml
index dacb437d4b4..720266f1062 100644
--- a/x-pack/qa/rolling-upgrade/src/test/resources/rest-api-spec/test/upgraded_cluster/60_watcher.yml
+++ b/x-pack/qa/rolling-upgrade/src/test/resources/rest-api-spec/test/upgraded_cluster/60_watcher.yml
@@ -1,10 +1,5 @@
 ---
 "CRUD watch APIs":
-
-  - skip:
-      reason: https://github.com/elastic/elasticsearch/issues/33185
-      version: "6.7.0 - "
-
   # no need to put watch, exists already
   - do:
       watcher.get_watch:
@@ -12,7 +7,6 @@
   - match: { found : true}
   - match: { _id: "my_watch" }
 
-
   # execute watch
   - do:
       watcher.execute_watch:
@@ -48,7 +42,7 @@
       watcher.deactivate_watch:
         watch_id: "my_watch"
   - match: { status.state.active : false }
-  
+
   - do:
       watcher.get_watch:
         id: "my_watch"
@@ -62,7 +56,7 @@
       watcher.activate_watch:
         watch_id: "my_watch"
   - match: { status.state.active : true }
-  
+
   - do:
       watcher.get_watch:
         id: "my_watch"
@@ -72,11 +66,6 @@
 
 ---
 "Test watcher stats output":
-
-  - skip:
-      reason: https://github.com/elastic/elasticsearch/issues/33185
-      version: "6.7.0 - "
-
   - do:
       watcher.stats: {}
   - match: { "manually_stopped": false }