From b6bab14fd4ec7ee35b143d4b5a40b0c2e1f4b139 Mon Sep 17 00:00:00 2001 From: David Kyle Date: Mon, 29 Jan 2018 13:24:07 +0000 Subject: [PATCH] Revert "Mute ML rolling upgrade tests. Awaits fix elastic/x-pack-elasticsearch#1760" This reverts commit elastic/x-pack-elasticsearch@deaf060818c80982fcc721cfc0e1d3386f0fabb8. Original commit: elastic/x-pack-elasticsearch@2eece7d27effdd317ee6f2f8856327eab5f45bba --- .../rest-api-spec/test/mixed_cluster/30_ml_jobs_crud.yml | 8 -------- .../test/mixed_cluster/40_ml_datafeed_crud.yml | 7 ------- .../rest-api-spec/test/old_cluster/30_ml_jobs_crud.yml | 3 --- .../test/old_cluster/40_ml_datafeed_crud.yml | 3 --- .../test/upgraded_cluster/30_ml_jobs_crud.yml | 3 --- .../test/upgraded_cluster/40_ml_datafeed_crud.yml | 4 ---- 6 files changed, 28 deletions(-) diff --git a/qa/rolling-upgrade/src/test/resources/rest-api-spec/test/mixed_cluster/30_ml_jobs_crud.yml b/qa/rolling-upgrade/src/test/resources/rest-api-spec/test/mixed_cluster/30_ml_jobs_crud.yml index e9003a79644..7bfbb5ad8c4 100644 --- a/qa/rolling-upgrade/src/test/resources/rest-api-spec/test/mixed_cluster/30_ml_jobs_crud.yml +++ b/qa/rolling-upgrade/src/test/resources/rest-api-spec/test/mixed_cluster/30_ml_jobs_crud.yml @@ -7,10 +7,6 @@ setup: --- "Test get old cluster job": - - skip: - version: "all" - reason: "Awaiting fix of #1760" - - do: xpack.ml.get_jobs: job_id: old-cluster-job @@ -48,10 +44,6 @@ setup: --- "Create a job in the mixed cluster and write some data": - - skip: - version: "all" - reason: "Awaiting fix of #1760" - - do: xpack.ml.put_job: job_id: mixed-cluster-job diff --git a/qa/rolling-upgrade/src/test/resources/rest-api-spec/test/mixed_cluster/40_ml_datafeed_crud.yml b/qa/rolling-upgrade/src/test/resources/rest-api-spec/test/mixed_cluster/40_ml_datafeed_crud.yml index d4187e2f69a..8a06c91cc8a 100644 --- a/qa/rolling-upgrade/src/test/resources/rest-api-spec/test/mixed_cluster/40_ml_datafeed_crud.yml +++ b/qa/rolling-upgrade/src/test/resources/rest-api-spec/test/mixed_cluster/40_ml_datafeed_crud.yml @@ -6,10 +6,6 @@ setup: --- "Test old cluster datafeed": - - skip: - version: "all" - reason: "Awaiting fix of #1760" - - do: xpack.ml.get_datafeeds: datafeed_id: old-cluster-datafeed @@ -26,9 +22,6 @@ setup: --- "Put job and datafeed in mixed cluster": - - skip: - version: "all" - reason: "Awaiting fix of #1760" - do: xpack.ml.put_job: 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 index e83d4450be6..de78feea78b 100644 --- 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,8 +1,5 @@ --- "Put job on the old cluster and post some data": - - skip: - version: "all" - reason: "Awaiting fix of #1760" - do: xpack.ml.put_job: diff --git a/qa/rolling-upgrade/src/test/resources/rest-api-spec/test/old_cluster/40_ml_datafeed_crud.yml b/qa/rolling-upgrade/src/test/resources/rest-api-spec/test/old_cluster/40_ml_datafeed_crud.yml index be30862b526..c1317bdf3d6 100644 --- a/qa/rolling-upgrade/src/test/resources/rest-api-spec/test/old_cluster/40_ml_datafeed_crud.yml +++ b/qa/rolling-upgrade/src/test/resources/rest-api-spec/test/old_cluster/40_ml_datafeed_crud.yml @@ -1,8 +1,5 @@ --- "Put job and datafeed in old cluster": - - skip: - version: "all" - reason: "Awaiting fix of #1760" - do: xpack.ml.put_job: diff --git a/qa/rolling-upgrade/src/test/resources/rest-api-spec/test/upgraded_cluster/30_ml_jobs_crud.yml b/qa/rolling-upgrade/src/test/resources/rest-api-spec/test/upgraded_cluster/30_ml_jobs_crud.yml index b9fd3cda86e..1ea309b0902 100644 --- a/qa/rolling-upgrade/src/test/resources/rest-api-spec/test/upgraded_cluster/30_ml_jobs_crud.yml +++ b/qa/rolling-upgrade/src/test/resources/rest-api-spec/test/upgraded_cluster/30_ml_jobs_crud.yml @@ -8,9 +8,6 @@ setup: --- "Test open old jobs": - - skip: - version: "all" - reason: "Awaiting fix of #1760" - do: xpack.ml.open_job: diff --git a/qa/rolling-upgrade/src/test/resources/rest-api-spec/test/upgraded_cluster/40_ml_datafeed_crud.yml b/qa/rolling-upgrade/src/test/resources/rest-api-spec/test/upgraded_cluster/40_ml_datafeed_crud.yml index c6026ba94fd..ed6a66ae1a5 100644 --- a/qa/rolling-upgrade/src/test/resources/rest-api-spec/test/upgraded_cluster/40_ml_datafeed_crud.yml +++ b/qa/rolling-upgrade/src/test/resources/rest-api-spec/test/upgraded_cluster/40_ml_datafeed_crud.yml @@ -18,10 +18,6 @@ setup: --- "Test old and mixed cluster datafeeds": - - skip: - version: "all" - reason: "Awaiting fix of #1760" - - do: xpack.ml.get_datafeeds: datafeed_id: old-cluster-datafeed