Update date_histo interval version skips and constants after backport

rest-api-spec/src/main/resources/rest-api-spec/test/search.aggregation/230_composite.yml

@@ -241,7 +241,7 @@ setup:
 ---
 "Composite aggregation with format":
   - skip:
-      version: " - 7.99.99" #TODO change this after backport
+      version: " - 7.1.99"
       reason:  calendar_interval introduced in 7.2.0
       features: warnings
 
@@ -307,7 +307,7 @@ setup:
 ---
 "Composite aggregation with format and calendar_interval":
   - skip:
-      version: " - 7.99.99" #TODO change this after backport
+      version: " - 7.1.99"
       reason:  calendar_interval introduced in 7.2.0
 
   - do:

rest-api-spec/src/main/resources/rest-api-spec/test/search.aggregation/250_moving_fn.yml

@@ -2,7 +2,7 @@
 "Bad window":
 
   - skip:
-      version: " - 7.99.0" #TODO change this after backport
+      version: " - 7.1.99"
       reason:  "calendar_interval added in 7.2"
 
   - do:
@@ -30,7 +30,7 @@
 "Bad window deprecated interval":
 
   - skip:
-      version: " - 7.99.0" #TODO change this after backport
+      version: " - 7.1.99"
       reason:  "interval deprecation added in 7.2"
       features: "warnings"
 

rest-api-spec/src/main/resources/rest-api-spec/test/search.aggregation/80_typed_keys.yml

@@ -206,7 +206,7 @@ setup:
 ---
 "Test typed keys parameter for date_histogram aggregation and max_bucket pipeline aggregation":
   - skip:
-      version: " - 7.99.0" #TODO change this after backport
+      version: " - 7.1.99"
       reason:  "calendar_interval added in 7.2"
   - do:
       search:

rest-api-spec/src/main/resources/rest-api-spec/test/search/240_date_nanos.yml

@@ -123,7 +123,7 @@ setup:
 ---
 "date histogram aggregation with date and date_nanos mapping":
   - skip:
-      version: " - 7.99.99" #TODO change this after backport
+      version: " - 7.1.99"
       reason:  calendar_interval introduced in 7.2.0
 
   - do:

server/src/main/java/org/elasticsearch/search/aggregations/bucket/histogram/DateIntervalWrapper.java

@@ -113,7 +113,7 @@ public static <T extends DateIntervalConsumer> void declareIntervalFields(Object
     public DateIntervalWrapper() {}
 
     public DateIntervalWrapper(StreamInput in) throws IOException {
-        if (in.getVersion().before(Version.V_8_0_0)) { // TODO change this after backport
+        if (in.getVersion().before(Version.V_7_2_0)) {
             long interval = in.readLong();
             DateHistogramInterval histoInterval = in.readOptionalWriteable(DateHistogramInterval::new);
 
@@ -374,7 +374,7 @@ public boolean isEmpty() {
 
     @Override
     public void writeTo(StreamOutput out) throws IOException {
-        if (out.getVersion().before(Version.V_8_0_0)) { // TODO change this after backport
+        if (out.getVersion().before(Version.V_7_2_0)) {
             if (intervalType.equals(IntervalTypeEnum.LEGACY_INTERVAL)) {
                 out.writeLong(TimeValue.parseTimeValue(dateHistogramInterval.toString(),
                     DateHistogramAggregationBuilder.NAME + ".innerWriteTo").getMillis());

x-pack/qa/full-cluster-restart/src/test/java/org/elasticsearch/xpack/restart/FullClusterRestartIT.java

@@ -229,7 +229,7 @@ public void testRollupAfterRestart() throws Exception {
             final Request createRollupJobRequest = new Request("PUT", getRollupEndpoint() + "/job/rollup-job-test");
 
             String intervalType;
-            if (getOldClusterVersion().onOrAfter(Version.V_8_0_0)) { // TODO change this after backport
+            if (getOldClusterVersion().onOrAfter(Version.V_7_2_0)) {
                 intervalType = "fixed_interval";
             } else {
                 intervalType = "interval";

x-pack/qa/rolling-upgrade/src/test/java/org/elasticsearch/upgrades/RollupDateHistoUpgradeIT.java

@@ -34,7 +34,7 @@ public class RollupDateHistoUpgradeIT extends AbstractUpgradeTestCase {
         Version.fromString(System.getProperty("tests.upgrade_from_version"));
 
     public void testDateHistoIntervalUpgrade() throws Exception {
-        assumeTrue("DateHisto interval changed in 7.1", UPGRADE_FROM_VERSION.before(Version.V_7_2_0));
+        assumeTrue("DateHisto interval changed in 7.2", UPGRADE_FROM_VERSION.before(Version.V_7_2_0));
         switch (CLUSTER_TYPE) {
             case OLD:
                 break;

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

@@ -1,8 +1,3 @@
-setup:
-  - skip:
-      version: "all"
-      reason:  "AwaitsFix https://github.com/elastic/elasticsearch/issues/42258"
-
 ---
 "Test old cluster datafeed without aggs":
   - do:
@@ -114,6 +109,7 @@ setup:
   - do:
       warnings:
         - '[interval] on [date_histogram] is deprecated, use [fixed_interval] or [calendar_interval] in the future.'
+        - '[interval] on [date_histogram] is deprecated, use [fixed_interval] or [calendar_interval] in the future.'
       ml.put_datafeed:
         datafeed_id: mixed-cluster-datafeed-with-aggs
         body:  >

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

@@ -1,8 +1,3 @@
-setup:
-  - skip:
-      version: "all"
-      reason:  "AwaitsFix https://github.com/elastic/elasticsearch/issues/42258"
-
 ---
 "Put job and datafeed without aggs in old cluster":
 
@@ -53,8 +48,8 @@ setup:
 ---
 "Put job and datafeed with aggs in old cluster - pre-deprecated interval":
   - skip:
-      version: "all"  #TODO change this after backport
-      reason:  "AwaitsFix https://github.com/elastic/elasticsearch/issues/42258; calendar_interval introduced in 7.2.0"
+      version: "7.1.99 - "
+      reason:  "calendar_interval introduced in 7.2.0"
 
   - do:
       ml.put_job:
@@ -123,8 +118,8 @@ setup:
 ---
 "Put job and datafeed with aggs in old cluster - deprecated interval with warning":
   - skip:
-      version: " - 7.99.99"  #TODO change this after backport
-      reason:  calendar_interval introduced in 7.1.0
+      version: " - 7.1.99"
+      reason:  calendar_interval introduced in 7.2.0
       features: warnings
 
   - do:

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

@@ -1,8 +1,4 @@
 setup:
-  - skip:
-      version: "all"
-      reason:  "AwaitsFix https://github.com/elastic/elasticsearch/issues/42258"
-
   - do:
      cluster.health:
         wait_for_status: green