From a21ff8672040f6a1a0f67274e74f104a9082f2d6 Mon Sep 17 00:00:00 2001
From: Ioannis Kakavas <ioannis@elastic.co>
Date: Thu, 30 May 2019 09:21:54 +0300
Subject: [PATCH] Revert "un-mute Watcher rolling upgrade tests and bump up
 logging (#42377)"

This reverts commit 697c793dcbabf1df0351d75a3705047ac4435dca.
---
 x-pack/qa/rolling-upgrade/build.gradle                    | 2 --
 .../rest-api-spec/test/mixed_cluster/60_watcher.yml       | 8 ++++++++
 .../rest-api-spec/test/old_cluster/60_watcher.yml         | 7 +++++++
 .../rest-api-spec/test/upgraded_cluster/60_watcher.yml    | 8 ++++++++
 4 files changed, 23 insertions(+), 2 deletions(-)

diff --git a/x-pack/qa/rolling-upgrade/build.gradle b/x-pack/qa/rolling-upgrade/build.gradle
index 8be945e701898..d75ecbd7a55ed 100644
--- a/x-pack/qa/rolling-upgrade/build.gradle
+++ b/x-pack/qa/rolling-upgrade/build.gradle
@@ -123,8 +123,6 @@ for (Version version : bwcVersions.wireCompatible) {
         setting 'xpack.security.authc.token.timeout', '60m'
         setting 'logger.org.elasticsearch.xpack.security.authc.TokenService', 'trace'
         setting 'xpack.security.audit.enabled', 'true'
-	setting 'logger.org.elasticsearch.xpack.watcher', 'debug'
-        setting 'logger.org.elasticsearch.xpack.core.watcher', 'debug'
         rootProject.globalInfo.ready {
             if (project.inFipsJvm) {
                 setting 'xpack.security.transport.ssl.key', 'testnode.pem'
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 1ce3f35049ecd..2a1dd4397dc56 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,6 +1,10 @@
 ---
 "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:
@@ -70,6 +74,10 @@
 ---
 "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 6e51e6b0dc717..aafb7ddf239bb 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,5 +1,8 @@
 ---
 "CRUD watch APIs":
+  - skip:
+      reason: https://github.com/elastic/elasticsearch/issues/33185
+      version: "6.7.0 - "
 
   - do:
       watcher.put_watch:
@@ -90,6 +93,10 @@
 ---
 "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 e9574215dc44e..dacb437d4b449 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,6 +1,10 @@
 ---
 "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:
@@ -69,6 +73,10 @@
 ---
 "Test watcher stats output":
 
+  - skip:
+      reason: https://github.com/elastic/elasticsearch/issues/33185
+      version: "6.7.0 - "
+
   - do:
       watcher.stats: {}
   - match: { "manually_stopped": false }