[ML][Data Frame] enable bwc tests again, adjusting after backport (#4…

…4720)
elastic · Jul 23, 2019 · e22ce5a · e22ce5a
1 parent 36f64a3
commit e22ce5a
Show file tree

Hide file tree

Showing 5 changed files with 4 additions and 28 deletions.
diff --git a/...in/java/org/elasticsearch/xpack/core/dataframe/action/DeleteDataFrameTransformAction.java b/...in/java/org/elasticsearch/xpack/core/dataframe/action/DeleteDataFrameTransformAction.java
@@ -39,7 +39,7 @@ public Request(String id, boolean force) {
         public Request(StreamInput in) throws IOException {
             super(in);
             id = in.readString();
-            if (in.getVersion().onOrAfter(Version.CURRENT)) {
+            if (in.getVersion().onOrAfter(Version.V_7_4_0)) {
                 force = in.readBoolean();
             } else {
                 force = false;
@@ -58,7 +58,7 @@ public boolean isForce() {
         public void writeTo(StreamOutput out) throws IOException {
             super.writeTo(out);
             out.writeString(id);
-            if (out.getVersion().onOrAfter(Version.CURRENT)) {
+            if (out.getVersion().onOrAfter(Version.V_7_4_0)) {
                 out.writeBoolean(force);
             }
         }

diff --git a/.../main/java/org/elasticsearch/xpack/core/dataframe/action/PutDataFrameTransformAction.java b/.../main/java/org/elasticsearch/xpack/core/dataframe/action/PutDataFrameTransformAction.java
@@ -53,7 +53,7 @@ public Request(DataFrameTransformConfig config, boolean deferValidation) {
         public Request(StreamInput in) throws IOException {
             super(in);
             this.config = new DataFrameTransformConfig(in);
-            if (in.getVersion().onOrAfter(Version.CURRENT)) {
+            if (in.getVersion().onOrAfter(Version.V_7_4_0)) {
                 this.deferValidation = in.readBoolean();
             } else {
                 this.deferValidation = false;
@@ -129,7 +129,7 @@ public boolean isDeferValidation() {
         public void writeTo(StreamOutput out) throws IOException {
             super.writeTo(out);
             this.config.writeTo(out);
-            if (out.getVersion().onOrAfter(Version.CURRENT)) {
+            if (out.getVersion().onOrAfter(Version.V_7_4_0)) {
                 out.writeBoolean(this.deferValidation);
             }
         }

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: "7.4.0 - "
-      reason: waiting backport of https://github.com/elastic/elasticsearch/pull/44590
   - do:
       cluster.health:
         index: "dataframe-transform-airline-data"
@@ -121,9 +118,6 @@
 
 ---
 "Test put continuous data frame transform on mixed cluster":
-  - skip:
-      version: "7.4.0 - "
-      reason: waiting backport of https://github.com/elastic/elasticsearch/pull/44590
   - do:
       cluster.health:
         index: "dataframe-transform-airline-data-cont"
@@ -192,9 +186,6 @@
 
 ---
 "Test GET, start, and stop old cluster batch transforms":
-  - skip:
-      version: "7.4.0 - "
-      reason: waiting backport of https://github.com/elastic/elasticsearch/pull/44590
   - do:
       cluster.health:
         index: "dataframe-transform-airline-data"
@@ -284,9 +275,6 @@
 
 ---
 "Test GET, stop, start, old continuous transforms":
-  - skip:
-      version: "7.4.0 - "
-      reason: waiting backport of https://github.com/elastic/elasticsearch/pull/44590
   - do:
       cluster.health:
         index: "dataframe-transform-airline-data-cont"

diff --git a/...ing-upgrade/src/test/resources/rest-api-spec/test/old_cluster/80_data_frame_jobs_crud.yml b/...ing-upgrade/src/test/resources/rest-api-spec/test/old_cluster/80_data_frame_jobs_crud.yml
@@ -1,8 +1,5 @@
 ---
 "Test put batch data frame transforms on old cluster":
-  - skip:
-      version: "7.4.0 - "
-      reason: waiting backport of https://github.com/elastic/elasticsearch/pull/44590
   - do:
       indices.create:
         index: dataframe-transform-airline-data
@@ -139,9 +136,6 @@
 
 ---
 "Test put continuous data frame transform on old cluster":
-  - skip:
-      version: "7.4.0 - "
-      reason: waiting backport of https://github.com/elastic/elasticsearch/pull/44590
   - do:
       indices.create:
         index: dataframe-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
@@ -7,9 +7,6 @@ setup:
         timeout: 70s
 ---
 "Get start, stop, and delete old and mixed cluster batch data frame transforms":
-  - skip:
-      version: "7.4.0 - "
-      reason: waiting backport of https://github.com/elastic/elasticsearch/pull/44590
   # Simple and complex OLD transforms
   - do:
       data_frame.get_data_frame_transform:
@@ -165,9 +162,6 @@ setup:
 
 ---
 "Test GET, stop, delete, old and mixed continuous transforms":
-  - skip:
-      version: "7.4.0 - "
-      reason: waiting backport of https://github.com/elastic/elasticsearch/pull/44590
   - do:
       data_frame.get_data_frame_transform:
         transform_id: "old-simple-continuous-transform"