[ML] fixing datafeed BWC tests (#40691)

* [ML] fixing datafeed BWC tests

* fixing df name typo

x-pack/qa/rolling-upgrade/src/test/resources/rest-api-spec/test/upgraded_cluster/40_ml_datafeed_crud.yml

@@ -5,6 +5,9 @@ setup:
         wait_for_nodes: 3
         # wait for long enough that we give delayed unassigned shards to stop being delayed
         timeout: 70s
+ 
+---
+"Test old and mixed cluster datafeeds without aggs":
   - do:
       indices.create:
         index: airline-data
@@ -13,8 +16,7 @@ setup:
             properties:
               time:
                 type: date
----
-"Test old and mixed cluster datafeeds without aggs":
+
   - do:
       ml.get_datafeeds:
         datafeed_id: old-cluster-datafeed-without-aggs
@@ -45,8 +47,73 @@ setup:
   - match: { datafeeds.0.state: "stopped"}
   - is_false: datafeeds.0.node
 
+  - do:
+      ml.open_job:
+        job_id: old-cluster-datafeed-job-without-aggs
+
+  - do:
+      ml.start_datafeed:
+        datafeed_id: old-cluster-datafeed-without-aggs
+        start: 0
+
+  - do:
+      ml.stop_datafeed:
+        datafeed_id: old-cluster-datafeed-without-aggs
+
+  - do:
+      ml.close_job:
+        job_id: old-cluster-datafeed-job-without-aggs
+
+  - do:
+      ml.delete_datafeed:
+        datafeed_id: old-cluster-datafeed-without-aggs
+
+  - do:
+      ml.delete_job:
+        job_id: old-cluster-datafeed-job-without-aggs
+  - match: { acknowledged: true }
+
+  - do:
+      ml.open_job:
+        job_id: mixed-cluster-datafeed-job-without-aggs
+
+  - do:
+      ml.start_datafeed:
+        datafeed_id: mixed-cluster-datafeed-without-aggs
+        start: 0
+
+  - do:
+      ml.stop_datafeed:
+        datafeed_id: mixed-cluster-datafeed-without-aggs
+
+  - do:
+      ml.close_job:
+        job_id: mixed-cluster-datafeed-job-without-aggs
+
+  - do:
+      ml.delete_datafeed:
+        datafeed_id: mixed-cluster-datafeed-without-aggs
+
+  - do:
+      ml.delete_job:
+        job_id: mixed-cluster-datafeed-job-without-aggs
+  - match: { acknowledged: true }
+
+  - do:
+      indices.delete:
+        index: airline-data
+
 ---
 "Test old and mixed cluster datafeeds with aggs":
+  - do:
+      indices.create:
+        index: airline-data
+        body:
+          mappings:
+            properties:
+              time:
+                type: date
+
   - do:
       ml.get_datafeeds:
         datafeed_id: old-cluster-datafeed-with-aggs
@@ -81,52 +148,56 @@ setup:
 
   - do:
       ml.open_job:
-        job_id: old-cluster-datafeed-job
+        job_id: old-cluster-datafeed-job-with-aggs
 
   - do:
       ml.start_datafeed:
-        datafeed_id: old-cluster-datafeed
+        datafeed_id: old-cluster-datafeed-with-aggs
         start: 0
 
   - do:
       ml.stop_datafeed:
-        datafeed_id: old-cluster-datafeed
+        datafeed_id: old-cluster-datafeed-with-aggs
 
   - do:
       ml.close_job:
-        job_id: old-cluster-datafeed-job
+        job_id: old-cluster-datafeed-job-with-aggs
 
   - do:
       ml.delete_datafeed:
-        datafeed_id: old-cluster-datafeed
+        datafeed_id: old-cluster-datafeed-with-aggs
 
   - do:
       ml.delete_job:
-        job_id: old-cluster-datafeed-job
+        job_id: old-cluster-datafeed-job-with-aggs
   - match: { acknowledged: true }
 
   - do:
       ml.open_job:
-        job_id: mixed-cluster-datafeed-job
+        job_id: mixed-cluster-datafeed-job-with-aggs
 
   - do:
       ml.start_datafeed:
-        datafeed_id: mixed-cluster-datafeed
+        datafeed_id: mixed-cluster-datafeed-with-aggs
         start: 0
 
   - do:
       ml.stop_datafeed:
-        datafeed_id: mixed-cluster-datafeed
+        datafeed_id: mixed-cluster-datafeed-with-aggs
 
   - do:
       ml.close_job:
-        job_id: mixed-cluster-datafeed-job
+        job_id: mixed-cluster-datafeed-job-with-aggs
 
   - do:
       ml.delete_datafeed:
-        datafeed_id: mixed-cluster-datafeed
+        datafeed_id: mixed-cluster-datafeed-with-aggs
 
   - do:
       ml.delete_job:
-        job_id: mixed-cluster-datafeed-job
+        job_id: mixed-cluster-datafeed-job-with-aggs
   - match: { acknowledged: true }
+
+  - do:
+      indices.delete:
+        index: airline-data