Revert "un-mute Watcher rolling upgrade tests and bump up logging (el…

…astic#42377)" This reverts commit 697c793.
jkakavas · May 30, 2019 · a21ff86 · a21ff86
1 parent f70cd1c
commit a21ff86
Show file tree

Hide file tree

Showing 4 changed files with 23 additions and 2 deletions.
diff --git 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
@@ -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
@@ -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/.../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,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 }