From 3ef69ad29b051dbaa3a66849d09451aafdaf4675 Mon Sep 17 00:00:00 2001 From: Dimitris Athanasiou Date: Tue, 24 Mar 2020 12:33:28 +0200 Subject: [PATCH] [ML] Unmute DFA bwc tests after backport of #53998 (#54063) Relates #53998 --- .../core/ml/action/GetDataFrameAnalyticsStatsAction.java | 4 ++-- .../test/mixed_cluster/90_ml_data_frame_analytics_crud.yml | 5 ----- .../test/old_cluster/90_ml_data_frame_analytics_crud.yml | 3 --- .../upgraded_cluster/90_ml_data_frame_analytics_crud.yml | 5 ----- 4 files changed, 2 insertions(+), 15 deletions(-) diff --git a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/ml/action/GetDataFrameAnalyticsStatsAction.java b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/ml/action/GetDataFrameAnalyticsStatsAction.java index 3f65a917a7427..e37ccbbefc5b1 100644 --- a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/ml/action/GetDataFrameAnalyticsStatsAction.java +++ b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/ml/action/GetDataFrameAnalyticsStatsAction.java @@ -203,7 +203,7 @@ public Stats(StreamInput in) throws IOException { } else { progress = in.readList(PhaseProgress::new); } - if (in.getVersion().onOrAfter(Version.V_8_0_0)) { + if (in.getVersion().onOrAfter(Version.V_7_7_0)) { dataCounts = in.readOptionalWriteable(DataCounts::new); } else { dataCounts = null; @@ -349,7 +349,7 @@ public void writeTo(StreamOutput out) throws IOException { } else { out.writeList(progress); } - if (out.getVersion().onOrAfter(Version.V_8_0_0)) { + if (out.getVersion().onOrAfter(Version.V_7_7_0)) { out.writeOptionalWriteable(dataCounts); } if (out.getVersion().onOrAfter(Version.V_7_7_0)) { diff --git a/x-pack/qa/rolling-upgrade/src/test/resources/rest-api-spec/test/mixed_cluster/90_ml_data_frame_analytics_crud.yml b/x-pack/qa/rolling-upgrade/src/test/resources/rest-api-spec/test/mixed_cluster/90_ml_data_frame_analytics_crud.yml index 38c78803b6f61..5049f3360a42e 100644 --- a/x-pack/qa/rolling-upgrade/src/test/resources/rest-api-spec/test/mixed_cluster/90_ml_data_frame_analytics_crud.yml +++ b/x-pack/qa/rolling-upgrade/src/test/resources/rest-api-spec/test/mixed_cluster/90_ml_data_frame_analytics_crud.yml @@ -1,8 +1,3 @@ -setup: - - skip: - version: "all" - reason: "Until backport of https://github.com/elastic/elasticsearch/pull/53998" - --- "Get old outlier_detection job": diff --git a/x-pack/qa/rolling-upgrade/src/test/resources/rest-api-spec/test/old_cluster/90_ml_data_frame_analytics_crud.yml b/x-pack/qa/rolling-upgrade/src/test/resources/rest-api-spec/test/old_cluster/90_ml_data_frame_analytics_crud.yml index 3f5c68ab93d28..923a56395e8a4 100644 --- a/x-pack/qa/rolling-upgrade/src/test/resources/rest-api-spec/test/old_cluster/90_ml_data_frame_analytics_crud.yml +++ b/x-pack/qa/rolling-upgrade/src/test/resources/rest-api-spec/test/old_cluster/90_ml_data_frame_analytics_crud.yml @@ -1,7 +1,4 @@ setup: - - skip: - version: "all" - reason: "Until backport of https://github.com/elastic/elasticsearch/pull/53998" - do: index: diff --git a/x-pack/qa/rolling-upgrade/src/test/resources/rest-api-spec/test/upgraded_cluster/90_ml_data_frame_analytics_crud.yml b/x-pack/qa/rolling-upgrade/src/test/resources/rest-api-spec/test/upgraded_cluster/90_ml_data_frame_analytics_crud.yml index 4a98e6440c662..3af10eb33e286 100644 --- a/x-pack/qa/rolling-upgrade/src/test/resources/rest-api-spec/test/upgraded_cluster/90_ml_data_frame_analytics_crud.yml +++ b/x-pack/qa/rolling-upgrade/src/test/resources/rest-api-spec/test/upgraded_cluster/90_ml_data_frame_analytics_crud.yml @@ -1,8 +1,3 @@ -setup: - - skip: - version: "all" - reason: "Until backport of https://github.com/elastic/elasticsearch/pull/53998" - --- "Get old cluster outlier_detection job":