[ML]: adjusting post backport of (#35645) (#35696)

elastic · Nov 19, 2018 · 80bcf7c · 80bcf7c
1 parent a0e6972
commit 80bcf7c
Show file tree

Hide file tree

Showing 7 changed files with 2 additions and 28 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
@@ -138,7 +138,7 @@ public AnalysisConfig(StreamInput in) throws IOException {
 
         // BWC for result_finalization_window and overlapping_buckets
         // TODO Remove in 7.0.0
-        if (in.getVersion().before(Version.CURRENT)) {//setting to current before backport
+        if (in.getVersion().before(Version.V_6_6_0)) {
             in.readOptionalBoolean();
             in.readOptionalLong();
         }
@@ -182,7 +182,7 @@ public void writeTo(StreamOutput out) throws IOException {
 
         // BWC for result_finalization_window and overlapping_buckets
         // TODO Remove in 7.0.0
-        if (out.getVersion().before(Version.CURRENT)) { //setting to current before backport
+        if (out.getVersion().before(Version.V_6_6_0)) {
             out.writeOptionalBoolean(null);
             out.writeOptionalLong(null);
         }

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,4 @@
 ---
-setup:
-  - skip:
-     version: "all"
-     reason: "Temporarily disabled while backporting https://github.com/elastic/elasticsearch/pull/35645"
----
 "Test get old cluster job":
   - do:
       xpack.ml.get_jobs:

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,4 @@
 ---
-setup:
-  - skip:
-     version: "all"
-     reason: "Temporarily disabled while backporting https://github.com/elastic/elasticsearch/pull/35645"
----
 "Test old cluster datafeed":
   - do:
       xpack.ml.get_datafeeds:

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,4 @@
 ---
-setup:
-  - skip:
-     version: "all"
-     reason: "Temporarily disabled while backporting https://github.com/elastic/elasticsearch/pull/35645"
----
 "Put job on the old cluster and post some data":
 
   - do:

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,4 @@
 ---
-setup:
-  - skip:
-     version: "all"
-     reason: "Temporarily disabled while backporting https://github.com/elastic/elasticsearch/pull/35645"
----
 "Put job and datafeed in old cluster":
 
   - do:

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,7 +1,4 @@
 setup:
- - skip:
-     version: "all"
-     reason: "Temporarily disabled while backporting https://github.com/elastic/elasticsearch/pull/35645"
  - 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,7 +1,4 @@
 setup:
-  - skip:
-     version: "all"
-     reason: "Temporarily disabled while backporting https://github.com/elastic/elasticsearch/pull/35645"
   - do:
      cluster.health:
         wait_for_status: green