From 94a19605f5a5d473b1e6ce22e2a5700ac067c99b Mon Sep 17 00:00:00 2001 From: David Roberts Date: Tue, 23 Jul 2019 14:12:28 +0100 Subject: [PATCH 1/2] [ML-DataFrame] Muting tests for backport (#44749) Mutes data frame BWC tests prior to backporting #44350 --- .../test/mixed_cluster/80_data_frame_jobs_crud.yml | 12 ++++++++++++ .../test/old_cluster/80_data_frame_jobs_crud.yml | 6 ++++++ .../upgraded_cluster/80_data_frame_jobs_crud.yml | 6 ++++++ 3 files changed, 24 insertions(+) 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 abdd2dad6f916..7f5a9d5d21569 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.4.0 - " + reason: waiting backport of https://github.com/elastic/elasticsearch/pull/44350 - do: cluster.health: index: "dataframe-transform-airline-data" @@ -106,6 +109,9 @@ --- "Test put continuous data frame transform on mixed cluster": + - skip: + version: "7.4.0 - " + reason: waiting backport of https://github.com/elastic/elasticsearch/pull/44350 - 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.4.0 - " + reason: waiting backport of https://github.com/elastic/elasticsearch/pull/44350 - do: cluster.health: index: "dataframe-transform-airline-data" @@ -245,6 +254,9 @@ --- "Test GET, stop, start, old continuous transforms": + - skip: + version: "7.4.0 - " + reason: waiting backport of https://github.com/elastic/elasticsearch/pull/44350 - 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..7c0ae327994d5 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.4.0 - " + reason: waiting backport of https://github.com/elastic/elasticsearch/pull/44350 - do: indices.create: index: dataframe-transform-airline-data @@ -136,6 +139,9 @@ --- "Test put continuous data frame transform on old cluster": + - skip: + version: "7.4.0 - " + reason: waiting backport of https://github.com/elastic/elasticsearch/pull/44350 - 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 e149a249fff78..c6b5343603d5f 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.4.0 - " + reason: waiting backport of https://github.com/elastic/elasticsearch/pull/44350 # 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.4.0 - " + reason: waiting backport of https://github.com/elastic/elasticsearch/pull/44350 - do: data_frame.get_data_frame_transform: transform_id: "old-simple-continuous-transform" From e9978cea540b9a31a79afe977570535ef7f0cb94 Mon Sep 17 00:00:00 2001 From: David Roberts Date: Thu, 25 Jul 2019 12:19:30 +0100 Subject: [PATCH 2/2] [ML-DataFrame] Muting tests for backport Mutes data frame BWC tests prior to backporting #44768 --- .../test/mixed_cluster/80_data_frame_jobs_crud.yml | 8 ++++---- .../test/old_cluster/80_data_frame_jobs_crud.yml | 4 ++-- .../test/upgraded_cluster/80_data_frame_jobs_crud.yml | 4 ++-- 3 files changed, 8 insertions(+), 8 deletions(-) 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 7f5a9d5d21569..96586d6823822 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 @@ -2,7 +2,7 @@ "Test put batch data frame transforms on mixed cluster": - skip: version: "7.4.0 - " - reason: waiting backport of https://github.com/elastic/elasticsearch/pull/44350 + reason: waiting backport of https://github.com/elastic/elasticsearch/pull/44768 - do: cluster.health: index: "dataframe-transform-airline-data" @@ -111,7 +111,7 @@ "Test put continuous data frame transform on mixed cluster": - skip: version: "7.4.0 - " - reason: waiting backport of https://github.com/elastic/elasticsearch/pull/44350 + reason: waiting backport of https://github.com/elastic/elasticsearch/pull/44768 - do: cluster.health: index: "dataframe-transform-airline-data-cont" @@ -176,7 +176,7 @@ "Test GET, start, and stop old cluster batch transforms": - skip: version: "7.4.0 - " - reason: waiting backport of https://github.com/elastic/elasticsearch/pull/44350 + reason: waiting backport of https://github.com/elastic/elasticsearch/pull/44768 - do: cluster.health: index: "dataframe-transform-airline-data" @@ -256,7 +256,7 @@ "Test GET, stop, start, old continuous transforms": - skip: version: "7.4.0 - " - reason: waiting backport of https://github.com/elastic/elasticsearch/pull/44350 + reason: waiting backport of https://github.com/elastic/elasticsearch/pull/44768 - 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 7c0ae327994d5..724d61f83a60c 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 @@ -2,7 +2,7 @@ "Test put batch data frame transforms on old cluster": - skip: version: "7.4.0 - " - reason: waiting backport of https://github.com/elastic/elasticsearch/pull/44350 + reason: waiting backport of https://github.com/elastic/elasticsearch/pull/44768 - do: indices.create: index: dataframe-transform-airline-data @@ -141,7 +141,7 @@ "Test put continuous data frame transform on old cluster": - skip: version: "7.4.0 - " - reason: waiting backport of https://github.com/elastic/elasticsearch/pull/44350 + reason: waiting backport of https://github.com/elastic/elasticsearch/pull/44768 - 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 c6b5343603d5f..b8f349bf0dcbb 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 @@ -9,7 +9,7 @@ setup: "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/44350 + reason: waiting backport of https://github.com/elastic/elasticsearch/pull/44768 # Simple and complex OLD transforms - do: data_frame.get_data_frame_transform: @@ -167,7 +167,7 @@ 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/44350 + reason: waiting backport of https://github.com/elastic/elasticsearch/pull/44768 - do: data_frame.get_data_frame_transform: transform_id: "old-simple-continuous-transform"