Browse Source

[ML] Unmute tests following backport (#48037)

Unmutes the tests that were temporarily muted in #47994
David Roberts 6 years ago
parent
commit
bd9ace6e4e

+ 0 - 15
x-pack/qa/rolling-upgrade/src/test/resources/rest-api-spec/test/mixed_cluster/30_ml_jobs_crud.yml

@@ -1,8 +1,5 @@
 ---
 "Test get old cluster job":
-  - skip:
-      version: "7.5.0 - "
-      reason: waiting merge of https://github.com/elastic/elasticsearch/pull/47993
   - do:
       ml.get_jobs:
         job_id: old-cluster-job
@@ -40,9 +37,6 @@
 
 ---
 "Test get old cluster job's timing stats":
-  - skip:
-      version: "7.5.0 - "
-      reason: waiting merge of https://github.com/elastic/elasticsearch/pull/47993
   - do:
       ml.get_job_stats:
         job_id: old-cluster-job-with-ts
@@ -57,9 +51,6 @@
 
 ---
 "Test get old cluster categorization job":
-  - skip:
-      version: "7.5.0 - "
-      reason: waiting merge of https://github.com/elastic/elasticsearch/pull/47993
   - do:
       ml.get_jobs:
         job_id: old-cluster-categorization-job
@@ -97,9 +88,6 @@
 
 ---
 "Create a job in the mixed cluster and write some data":
-  - skip:
-      version: "7.5.0 - "
-      reason: waiting merge of https://github.com/elastic/elasticsearch/pull/47993
   - do:
       ml.put_job:
         job_id: mixed-cluster-job
@@ -153,9 +141,6 @@
 ---
 "Test job with pre 6.4 rules":
 
-  - skip:
-      version: "7.5.0 - "
-      reason: waiting merge of https://github.com/elastic/elasticsearch/pull/47993
   - do:
       ml.get_jobs:
         job_id: job-with-old-rules

+ 0 - 21
x-pack/qa/rolling-upgrade/src/test/resources/rest-api-spec/test/mixed_cluster/90_ml_data_frame_analytics_crud.yml

@@ -1,9 +1,6 @@
 ---
 "Get old outlier_detection job":
 
-  - skip:
-      version: "7.5.0 - "
-      reason: waiting merge of https://github.com/elastic/elasticsearch/pull/47993
   - do:
       ml.get_data_frame_analytics:
         id: "old_cluster_outlier_detection_job"
@@ -23,9 +20,6 @@
 ---
 "Get old outlier_detection job stats":
 
-  - skip:
-      version: "7.5.0 - "
-      reason: waiting merge of https://github.com/elastic/elasticsearch/pull/47993
   - do:
       ml.get_data_frame_analytics_stats:
         id: "old_cluster_outlier_detection_job"
@@ -36,9 +30,6 @@
 ---
 "Start and stop old outlier_detection job":
 
-  - skip:
-      version: "7.5.0 - "
-      reason: waiting merge of https://github.com/elastic/elasticsearch/pull/47993
   - do:
       ml.start_data_frame_analytics:
         id: "old_cluster_outlier_detection_job"
@@ -59,9 +50,6 @@
 ---
 "Get old regression job":
 
-  - skip:
-      version: "7.5.0 - "
-      reason: waiting merge of https://github.com/elastic/elasticsearch/pull/47993
   - do:
       ml.get_data_frame_analytics:
         id: "old_cluster_regression_job"
@@ -75,9 +63,6 @@
 ---
 "Get old regression job stats":
 
-  - skip:
-      version: "7.5.0 - "
-      reason: waiting merge of https://github.com/elastic/elasticsearch/pull/47993
   - do:
       ml.get_data_frame_analytics_stats:
         id: "old_cluster_regression_job"
@@ -88,9 +73,6 @@
 ---
 "Start and stop old regression job":
 
-  - skip:
-      version: "7.5.0 - "
-      reason: waiting merge of https://github.com/elastic/elasticsearch/pull/47993
   - do:
       ml.start_data_frame_analytics:
         id: "old_cluster_regression_job"
@@ -111,9 +93,6 @@
 ---
 "Put an outlier_detection job on the mixed cluster":
 
-  - skip:
-      version: "7.5.0 - "
-      reason: waiting merge of https://github.com/elastic/elasticsearch/pull/47993
   - do:
       ml.put_data_frame_analytics:
         id: "mixed_cluster_outlier_detection_job"

+ 0 - 12
x-pack/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: "7.5.0 - "
-      reason: waiting merge of https://github.com/elastic/elasticsearch/pull/47993
   - do:
       ml.open_job:
         job_id: old-cluster-job
@@ -114,9 +111,6 @@ setup:
 
 ---
 "Test get old cluster job's timing stats":
-  - skip:
-      version: "7.5.0 - "
-      reason: waiting merge of https://github.com/elastic/elasticsearch/pull/47993
   - do:
       ml.get_job_stats:
         job_id: old-cluster-job-with-ts
@@ -142,9 +136,6 @@ setup:
 ---
 "Test job with pre 6.4 rules":
 
-  - skip:
-      version: "7.5.0 - "
-      reason: waiting merge of https://github.com/elastic/elasticsearch/pull/47993
   - do:
       ml.get_jobs:
         job_id: job-with-old-rules
@@ -155,9 +146,6 @@ setup:
 ---
 "Test get job with function shortcut should expand":
 
-  - skip:
-      version: "7.5.0 - "
-      reason: waiting merge of https://github.com/elastic/elasticsearch/pull/47993
   - do:
       ml.get_jobs:
         job_id: old-cluster-function-shortcut-expansion

+ 0 - 18
x-pack/qa/rolling-upgrade/src/test/resources/rest-api-spec/test/upgraded_cluster/90_ml_data_frame_analytics_crud.yml

@@ -1,9 +1,6 @@
 ---
 "Get old cluster outlier_detection job":
 
-  - skip:
-      version: "7.5.0 - "
-      reason: waiting merge of https://github.com/elastic/elasticsearch/pull/47993
   - do:
       ml.get_data_frame_analytics:
         id: "old_cluster_outlier_detection_job"
@@ -23,9 +20,6 @@
 ---
 "Get old cluster outlier_detection job stats":
 
-  - skip:
-      version: "7.5.0 - "
-      reason: waiting merge of https://github.com/elastic/elasticsearch/pull/47993
   - do:
       ml.get_data_frame_analytics_stats:
         id: "old_cluster_outlier_detection_job"
@@ -36,9 +30,6 @@
 ---
 "Get old cluster regression job":
 
-  - skip:
-      version: "7.5.0 - "
-      reason: waiting merge of https://github.com/elastic/elasticsearch/pull/47993
   - do:
       ml.get_data_frame_analytics:
         id: "old_cluster_regression_job"
@@ -52,9 +43,6 @@
 ---
 "Get old cluster regression job stats":
 
-  - skip:
-      version: "7.5.0 - "
-      reason: waiting merge of https://github.com/elastic/elasticsearch/pull/47993
   - do:
       ml.get_data_frame_analytics_stats:
         id: "old_cluster_regression_job"
@@ -65,9 +53,6 @@
 ---
 "Get mixed cluster outlier_detection job":
 
-  - skip:
-      version: "7.5.0 - "
-      reason: waiting merge of https://github.com/elastic/elasticsearch/pull/47993
   - do:
       ml.get_data_frame_analytics:
         id: "mixed_cluster_outlier_detection_job"
@@ -87,9 +72,6 @@
 ---
 "Get mixed cluster outlier_detection job stats":
 
-  - skip:
-      version: "7.5.0 - "
-      reason: waiting merge of https://github.com/elastic/elasticsearch/pull/47993
   - do:
       ml.get_data_frame_analytics_stats:
         id: "mixed_cluster_outlier_detection_job"