[7.6][Transform] separate old and mixed rolling upgrade tests (#48302)

separates rolling upgrade tests for transforms created on old and mixed clusters and disable testing transforms on mixed clusters for <7.4.
elastic · Oct 22, 2019 · 1cb3b0c · 1cb3b0c
1 parent bbe50ec
commit 1cb3b0c
Show file tree

Hide file tree

Showing 3 changed files with 26 additions and 33 deletions.
diff --git a/x-pack/qa/rolling-upgrade/build.gradle b/x-pack/qa/rolling-upgrade/build.gradle
@@ -196,10 +196,16 @@ for (Version bwcVersion : bwcVersions.wireCompatible) {
         def toBlackList = []
         // Dataframe transforms were not added until 7.2.0
         if (bwcVersion.before('7.2.0')) {
-            toBlackList << 'upgraded_cluster/80_data_frame_jobs_crud/Get start, stop, and delete old and mixed cluster batch data frame transforms'
-            toBlackList << 'upgraded_cluster/80_data_frame_jobs_crud/Test GET, stop, delete, old and mixed continuous transforms'
+            toBlackList << 'upgraded_cluster/80_data_frame_jobs_crud/Get start, stop, and delete old cluster batch data frame transforms'
+            toBlackList << 'upgraded_cluster/80_data_frame_jobs_crud/Test GET, stop, delete, old continuous transforms'
+        }
 
+        // transform in mixed cluster is effectively disabled till 7.4, see gh#48019
+        if (bwcVersion.before('7.4.0')) {
+            toBlackList << 'upgraded_cluster/80_data_frame_jobs_crud/Get start, stop mixed cluster batch data frame transforms'
+            toBlackList << 'upgraded_cluster/80_data_frame_jobs_crud/Test GET, mixed continuous transforms'
         }
+
         if (!toBlackList.empty) {
             systemProperty 'tests.rest.blacklist', toBlackList.join(',')
         }

diff --git a/...g-upgrade/src/test/resources/rest-api-spec/test/mixed_cluster/80_data_frame_jobs_crud.yml b/...g-upgrade/src/test/resources/rest-api-spec/test/mixed_cluster/80_data_frame_jobs_crud.yml
@@ -1,8 +1,5 @@
 ---
 "Test put batch data frame transforms on mixed cluster":
-  - skip:
-      version: "all"
-      reason: "https://github.com/elastic/elasticsearch/issues/47943"
   - do:
       cluster.health:
         index: "transform-airline-data"
@@ -114,9 +111,6 @@
 
 ---
 "Test put continuous data frame transform on mixed cluster":
-  - skip:
-      version: "all"
-      reason: "https://github.com/elastic/elasticsearch/issues/47943"
   - do:
       cluster.health:
         index: "transform-airline-data-cont"
@@ -183,9 +177,6 @@
 
 ---
 "Test GET, start, and stop old cluster batch transforms":
-  - skip:
-      version: "all"
-      reason: "https://github.com/elastic/elasticsearch/issues/47943"
   - do:
       cluster.health:
         index: "transform-airline-data"
@@ -270,9 +261,6 @@
 
 ---
 "Test GET, stop, start, old continuous transforms":
-  - skip:
-      version: "all"
-      reason: "https://github.com/elastic/elasticsearch/issues/47943"
   - do:
       cluster.health:
         index: "transform-airline-data-cont"

diff --git a/...pgrade/src/test/resources/rest-api-spec/test/upgraded_cluster/80_data_frame_jobs_crud.yml b/...pgrade/src/test/resources/rest-api-spec/test/upgraded_cluster/80_data_frame_jobs_crud.yml
@@ -6,10 +6,7 @@ setup:
         # wait for long enough that we give delayed unassigned shards to stop being delayed
         timeout: 70s
 ---
-"Get start, stop, and delete old and mixed cluster batch data frame transforms":
-  - skip:
-      version: "all"
-      reason: "https://github.com/elastic/elasticsearch/issues/47943"
+"Get start, stop, and delete old cluster batch data frame transforms":
   # Simple and complex OLD transforms
   - do:
       transform.get_transform:
@@ -77,7 +74,17 @@ setup:
   - match: { count: 1 }
   - match: { transforms.0.id: "old-complex-transform" }
   - match: { transforms.0.state: "stopped" }
+  # Delete old transform
+  - do:
+      transform.delete_transform:
+        transform_id: "old-simple-transform"
+  - do:
+      transform.get_transform_stats:
+        transform_id: "old-simple-transform"
+  - match: { count: 0 }
 
+---
+"Get start, stop mixed cluster batch data frame transforms":
   # Simple and complex Mixed cluster transforms
   - do:
       transform.get_transform:
@@ -146,26 +153,20 @@ setup:
   - match: { count: 1 }
   - match: { transforms.0.id: "mixed-complex-transform" }
   - match: { transforms.0.state: "stopped" }
-
-# Delete all old and mixed transforms
+  # Delete mixed transform
   - do:
       transform.delete_transform:
-        transform_id: "old-simple-transform"
-
+        transform_id: "mixed-simple-transform"
   - do:
       transform.delete_transform:
-        transform_id: "mixed-simple-transform"
-
+        transform_id: "mixed-complex-transform"
   - do:
       transform.get_transform_stats:
-        transform_id: "old-simple-transform,mixed-simple-transform"
+        transform_id: "mixed-simple-transform,mixed-complex-transform"
   - match: { count: 0 }
 
 ---
-"Test GET, stop, delete, old and mixed continuous transforms":
-  - skip:
-      version: "all"
-      reason: "https://github.com/elastic/elasticsearch/issues/47943"
+"Test GET, stop, delete, old continuous transforms":
   - do:
       transform.get_transform:
         transform_id: "old-simple-continuous-transform"
@@ -210,7 +211,8 @@ setup:
   - do:
       transform.delete_transform:
         transform_id: "old-simple-continuous-transform"
-
+---
+"Test GET, mixed continuous transforms":
   - do:
       transform.get_transform:
         transform_id: "mixed-simple-continuous-transform"
@@ -257,9 +259,6 @@ setup:
         transform_id: "mixed-simple-continuous-transform"
 ---
 "Test index mappings for latest internal index":
-  - skip:
-      version: "all"
-      reason: "https://github.com/elastic/elasticsearch/issues/47943"
   - do:
       transform.put_transform:
         transform_id: "upgraded-simple-transform"