un-mute Watcher rolling upgrade tests and bump up logging (#42377)

x-pack/qa/rolling-upgrade/build.gradle

@@ -123,6 +123,8 @@ 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'

x-pack/qa/rolling-upgrade/src/test/resources/rest-api-spec/test/mixed_cluster/60_watcher.yml

@@ -1,10 +1,6 @@
 ---
 "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:
@@ -74,10 +70,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 }

x-pack/qa/rolling-upgrade/src/test/resources/rest-api-spec/test/old_cluster/60_watcher.yml

@@ -1,8 +1,5 @@
 ---
 "CRUD watch APIs":
-  - skip:
-      reason: https://github.com/elastic/elasticsearch/issues/33185
-      version: "6.7.0 - "
 
   - do:
       watcher.put_watch:
@@ -93,10 +90,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 }

x-pack/qa/rolling-upgrade/src/test/resources/rest-api-spec/test/upgraded_cluster/60_watcher.yml

@@ -1,10 +1,6 @@
 ---
 "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:
@@ -73,10 +69,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 }