Re enable ml bwc tests (#32916)

[ML] Re-enabling BWC tests Re-enable BWC tests for ML now that #32816 has been backported to 6.x
elastic · Aug 16, 2018 · 62559d2 · 62559d2
1 parent d604b3e
commit 62559d2
Show file tree

Hide file tree

Showing 7 changed files with 4 additions and 38 deletions.
diff --git a/.../plugin/core/src/main/java/org/elasticsearch/xpack/core/ml/job/config/AnalysisConfig.java b/.../plugin/core/src/main/java/org/elasticsearch/xpack/core/ml/job/config/AnalysisConfig.java
@@ -162,9 +162,8 @@ public AnalysisConfig(StreamInput in) throws IOException {
         }
 
         // BWC for removed per-partition normalization
-        // Version check is temporarily against the latest to satisfy CI tests
-        // TODO change to V_6_5_0 after successful backport to 6.x
-        if (in.getVersion().before(Version.V_7_0_0_alpha1)) {
+        // TODO Remove in 7.0.0
+        if (in.getVersion().before(Version.V_6_5_0)) {
             in.readBoolean();
         }
     }
@@ -197,9 +196,8 @@ public void writeTo(StreamOutput out) throws IOException {
         }
 
         // BWC for removed per-partition normalization
-        // Version check is temporarily against the latest to satisfy CI tests
-        // TODO change to V_6_5_0 after successful backport to 6.x
-        if (out.getVersion().before(Version.V_7_0_0_alpha1)) {
+        // TODO Remove in 7.0.0
+        if (out.getVersion().before(Version.V_6_5_0)) {
             out.writeBoolean(false);
         }
     }

diff --git a/...a/rolling-upgrade/src/test/resources/rest-api-spec/test/mixed_cluster/30_ml_jobs_crud.yml b/...a/rolling-upgrade/src/test/resources/rest-api-spec/test/mixed_cluster/30_ml_jobs_crud.yml
@@ -1,9 +1,3 @@
----
-setup:
-    - skip:
-        version: "all"
-        reason: "Temporarily disabled while backporting https://github.com/elastic/elasticsearch/pull/32816"
-
 ---
 "Test get old cluster job":
   - do:

diff --git a/...lling-upgrade/src/test/resources/rest-api-spec/test/mixed_cluster/40_ml_datafeed_crud.yml b/...lling-upgrade/src/test/resources/rest-api-spec/test/mixed_cluster/40_ml_datafeed_crud.yml
@@ -1,9 +1,3 @@
----
-setup:
-    - skip:
-        version: "all"
-        reason: "Temporarily disabled while backporting https://github.com/elastic/elasticsearch/pull/32816"
-
 ---
 "Test old cluster datafeed":
   - do:

diff --git a/.../qa/rolling-upgrade/src/test/resources/rest-api-spec/test/old_cluster/30_ml_jobs_crud.yml b/.../qa/rolling-upgrade/src/test/resources/rest-api-spec/test/old_cluster/30_ml_jobs_crud.yml
@@ -1,9 +1,3 @@
----
-setup:
-    - skip:
-        version: "all"
-        reason: "Temporarily disabled while backporting https://github.com/elastic/elasticsearch/pull/32816"
-
 ---
 "Put job on the old cluster and post some data":
 

diff --git a/...rolling-upgrade/src/test/resources/rest-api-spec/test/old_cluster/40_ml_datafeed_crud.yml b/...rolling-upgrade/src/test/resources/rest-api-spec/test/old_cluster/40_ml_datafeed_crud.yml
@@ -1,9 +1,3 @@
----
-setup:
-    - skip:
-        version: "all"
-        reason: "Temporarily disabled while backporting https://github.com/elastic/elasticsearch/pull/32816"
-
 ---
 "Put job and datafeed in old cluster":
 

diff --git a/...olling-upgrade/src/test/resources/rest-api-spec/test/upgraded_cluster/30_ml_jobs_crud.yml b/...olling-upgrade/src/test/resources/rest-api-spec/test/upgraded_cluster/30_ml_jobs_crud.yml
@@ -1,8 +1,4 @@
 setup:
- - skip:
-     version: "all"
-     reason: "Temporarily disabled while backporting https://github.com/elastic/elasticsearch/pull/32816"
-
  - do:
      cluster.health:
         wait_for_status: green

diff --git a/...ng-upgrade/src/test/resources/rest-api-spec/test/upgraded_cluster/40_ml_datafeed_crud.yml b/...ng-upgrade/src/test/resources/rest-api-spec/test/upgraded_cluster/40_ml_datafeed_crud.yml
@@ -1,8 +1,4 @@
 setup:
-  - skip:
-      version: "all"
-      reason: "Temporarily disabled while backporting https://github.com/elastic/elasticsearch/pull/32816"
-
   - do:
      cluster.health:
         wait_for_status: green