diff --git a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/transform/action/StartTransformAction.java b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/transform/action/StartTransformAction.java index 2b219aa5e3a70..7d55237b2d507 100644 --- a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/transform/action/StartTransformAction.java +++ b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/transform/action/StartTransformAction.java @@ -42,7 +42,7 @@ public Request(String id) { public Request(StreamInput in) throws IOException { super(in); id = in.readString(); - if(in.getVersion().before(Version.V_8_0_0)) { + if(in.getVersion().before(Version.V_7_5_0)) { in.readBoolean(); } } @@ -55,7 +55,7 @@ public String getId() { public void writeTo(StreamOutput out) throws IOException { super.writeTo(out); out.writeString(id); - if(out.getVersion().before(Version.V_8_0_0)) { + if(out.getVersion().before(Version.V_7_5_0)) { out.writeBoolean(false); } } diff --git a/x-pack/qa/rolling-upgrade/src/test/resources/rest-api-spec/test/mixed_cluster/80_data_frame_jobs_crud.yml b/x-pack/qa/rolling-upgrade/src/test/resources/rest-api-spec/test/mixed_cluster/80_data_frame_jobs_crud.yml index bac5a6a9e993c..8954be68c88d6 100644 --- a/x-pack/qa/rolling-upgrade/src/test/resources/rest-api-spec/test/mixed_cluster/80_data_frame_jobs_crud.yml +++ b/x-pack/qa/rolling-upgrade/src/test/resources/rest-api-spec/test/mixed_cluster/80_data_frame_jobs_crud.yml @@ -1,5 +1,8 @@ --- "Test put batch data frame transforms on mixed cluster": + - skip: + version: "7.5.0 - " + reason: waiting backport of https://github.com/elastic/elasticsearch/pull/46414 - do: cluster.health: index: "dataframe-transform-airline-data" @@ -106,6 +109,9 @@ --- "Test put continuous data frame transform on mixed cluster": + - skip: + version: "7.5.0 - " + reason: waiting backport of https://github.com/elastic/elasticsearch/pull/46414 - do: cluster.health: index: "dataframe-transform-airline-data-cont" @@ -168,6 +174,9 @@ --- "Test GET, start, and stop old cluster batch transforms": + - skip: + version: "7.5.0 - " + reason: waiting backport of https://github.com/elastic/elasticsearch/pull/46414 - do: cluster.health: index: "dataframe-transform-airline-data" @@ -245,6 +254,9 @@ --- "Test GET, stop, start, old continuous transforms": + - skip: + version: "7.5.0 - " + reason: waiting backport of https://github.com/elastic/elasticsearch/pull/46414 - do: cluster.health: index: "dataframe-transform-airline-data-cont" diff --git a/x-pack/qa/rolling-upgrade/src/test/resources/rest-api-spec/test/old_cluster/80_data_frame_jobs_crud.yml b/x-pack/qa/rolling-upgrade/src/test/resources/rest-api-spec/test/old_cluster/80_data_frame_jobs_crud.yml index bf2b1f6b939f8..c06948467f59f 100644 --- a/x-pack/qa/rolling-upgrade/src/test/resources/rest-api-spec/test/old_cluster/80_data_frame_jobs_crud.yml +++ b/x-pack/qa/rolling-upgrade/src/test/resources/rest-api-spec/test/old_cluster/80_data_frame_jobs_crud.yml @@ -1,5 +1,8 @@ --- "Test put batch data frame transforms on old cluster": + - skip: + version: "7.5.0 - " + reason: waiting backport of https://github.com/elastic/elasticsearch/pull/46414 - do: indices.create: index: dataframe-transform-airline-data @@ -136,6 +139,9 @@ --- "Test put continuous data frame transform on old cluster": + - skip: + version: "7.5.0 - " + reason: waiting backport of https://github.com/elastic/elasticsearch/pull/46414 - do: indices.create: index: dataframe-transform-airline-data-cont diff --git a/x-pack/qa/rolling-upgrade/src/test/resources/rest-api-spec/test/upgraded_cluster/80_data_frame_jobs_crud.yml b/x-pack/qa/rolling-upgrade/src/test/resources/rest-api-spec/test/upgraded_cluster/80_data_frame_jobs_crud.yml index 4d92199625860..a1258fe5f64fd 100644 --- a/x-pack/qa/rolling-upgrade/src/test/resources/rest-api-spec/test/upgraded_cluster/80_data_frame_jobs_crud.yml +++ b/x-pack/qa/rolling-upgrade/src/test/resources/rest-api-spec/test/upgraded_cluster/80_data_frame_jobs_crud.yml @@ -7,6 +7,9 @@ setup: timeout: 70s --- "Get start, stop, and delete old and mixed cluster batch data frame transforms": + - skip: + version: "7.5.0 - " + reason: waiting backport of https://github.com/elastic/elasticsearch/pull/46414 # Simple and complex OLD transforms - do: data_frame.get_data_frame_transform: @@ -162,6 +165,9 @@ setup: --- "Test GET, stop, delete, old and mixed continuous transforms": + - skip: + version: "7.5.0 - " + reason: waiting backport of https://github.com/elastic/elasticsearch/pull/46414 - do: data_frame.get_data_frame_transform: transform_id: "old-simple-continuous-transform"