Add 2.10.0 to bwc versions. (opensearch-project#8670)

Forward port of opensearch-project#8667. Also, the version `2.9.99` has been used in several places to mean 'the last possible version before 3.0.0' which is not true given that 2.10.0 exists. This commit uses `2.99.99` instead. (Maybe I'll kick myself if we do 90 more minor version releases on the 2.x line?) Signed-off-by: Andrew Ross <andrross@amazon.com>
baba-devv · Jul 29, 2023 · 01367d6 · 01367d6
1 parent bf87d32
commit 01367d6
Show file tree

Hide file tree

Showing 15 changed files with 28 additions and 26 deletions.
diff --git a/.ci/bwcVersions b/.ci/bwcVersions
@@ -21,3 +21,4 @@ BWC_VERSION:
   - "2.8.0"
   - "2.8.1"
   - "2.9.0"
+  - "2.10.0"
diff --git a/libs/core/src/main/java/org/opensearch/Version.java b/libs/core/src/main/java/org/opensearch/Version.java
@@ -90,6 +90,7 @@ public class Version implements Comparable<Version>, ToXContentFragment {
     public static final Version V_2_8_0 = new Version(2080099, org.apache.lucene.util.Version.LUCENE_9_6_0);
     public static final Version V_2_8_1 = new Version(2080199, org.apache.lucene.util.Version.LUCENE_9_6_0);
     public static final Version V_2_9_0 = new Version(2090099, org.apache.lucene.util.Version.LUCENE_9_7_0);
+    public static final Version V_2_10_0 = new Version(2100099, org.apache.lucene.util.Version.LUCENE_9_7_0);
     public static final Version V_3_0_0 = new Version(3000099, org.apache.lucene.util.Version.LUCENE_9_7_0);
     public static final Version CURRENT = V_3_0_0;
 

diff --git a/rest-api-spec/src/main/resources/rest-api-spec/test/cluster.put_settings/10_basic.yml b/rest-api-spec/src/main/resources/rest-api-spec/test/cluster.put_settings/10_basic.yml
@@ -85,7 +85,7 @@
 "Test set invalid search backpressure mode":
 
   - skip:
-      version: "- 2.9.99"
+      version: "- 2.99.99"
       reason: "Parsing and validation of SearchBackpressureMode does not exist in versions < 3.0"
 
   - do:

diff --git a/rest-api-spec/src/main/resources/rest-api-spec/test/indices.clone/10_basic.yml b/rest-api-spec/src/main/resources/rest-api-spec/test/indices.clone/10_basic.yml
@@ -117,7 +117,7 @@ setup:
 "Returns error if target index's metadata write is blocked":
 
   - skip:
-      version: " - 2.9.99"
+      version: " - 2.99.99"
       reason: "only available in 3.0+"
 
   # block source index's write operations

diff --git a/rest-api-spec/src/main/resources/rest-api-spec/test/indices.clone/40_wait_for_completion.yml b/rest-api-spec/src/main/resources/rest-api-spec/test/indices.clone/40_wait_for_completion.yml
@@ -4,7 +4,7 @@
   # will return a task immediately and the clone operation will run in background.
 
   - skip:
-      version: " - 2.9.99"
+      version: " - 2.99.99"
       reason: "only available in 3.0+"
       features: allowed_warnings
 

diff --git a/...-spec/src/main/resources/rest-api-spec/test/indices.forcemerge/20_wait_for_completion.yml b/...-spec/src/main/resources/rest-api-spec/test/indices.forcemerge/20_wait_for_completion.yml
@@ -4,7 +4,7 @@
   # will return a task immediately and the merge process will run in background.
 
   - skip:
-      version: " - 2.9.99"
+      version: " - 2.99.99"
       reason: "only available in 3.0+"
       features: allowed_warnings
 

diff --git a/rest-api-spec/src/main/resources/rest-api-spec/test/indices.open/30_wait_for_completion.yml b/rest-api-spec/src/main/resources/rest-api-spec/test/indices.open/30_wait_for_completion.yml
@@ -4,7 +4,7 @@
   # will return a task immediately and the open operation will run in background.
 
   - skip:
-      version: " - 2.9.99"
+      version: " - 2.99.99"
       reason: "only available in 3.0+"
       features: allowed_warnings
 

diff --git a/rest-api-spec/src/main/resources/rest-api-spec/test/indices.shrink/10_basic.yml b/rest-api-spec/src/main/resources/rest-api-spec/test/indices.shrink/10_basic.yml
@@ -76,7 +76,7 @@ setup:
 "Returns error if target index's metadata write is blocked":
 
   - skip:
-      version: " - 2.9.99"
+      version: " - 2.99.99"
       reason: "only available in 3.0+"
 
   # block source index's write operations

diff --git a/rest-api-spec/src/main/resources/rest-api-spec/test/indices.shrink/40_max_shard_size.yml b/rest-api-spec/src/main/resources/rest-api-spec/test/indices.shrink/40_max_shard_size.yml
@@ -4,7 +4,7 @@
   # number_of_shards for the target index.
 
   - skip:
-      version: " - 2.9.99"
+      version: " - 2.99.99"
       reason: "only available in 3.0+"
       features: allowed_warnings
 

diff --git a/...-api-spec/src/main/resources/rest-api-spec/test/indices.shrink/50_wait_for_completion.yml b/...-api-spec/src/main/resources/rest-api-spec/test/indices.shrink/50_wait_for_completion.yml
@@ -4,7 +4,7 @@
   # will return a task immediately and the shrink operation will run in background.
 
   - skip:
-      version: " - 2.9.99"
+      version: " - 2.99.99"
       reason: "only available in 3.0+"
       features: allowed_warnings
 

diff --git a/rest-api-spec/src/main/resources/rest-api-spec/test/indices.split/10_basic.yml b/rest-api-spec/src/main/resources/rest-api-spec/test/indices.split/10_basic.yml
@@ -223,7 +223,7 @@ setup:
 "Returns error if target index's metadata write is blocked":
 
   - skip:
-      version: " - 2.9.99"
+      version: " - 2.99.99"
       reason: "only available in 3.0+"
 
   # block source index's write operations

diff --git a/rest-api-spec/src/main/resources/rest-api-spec/test/indices.split/40_wait_for_completion.yml b/rest-api-spec/src/main/resources/rest-api-spec/test/indices.split/40_wait_for_completion.yml
@@ -4,7 +4,7 @@
   # will return a task immediately and the split operation will run in background.
 
   - skip:
-      version: " - 2.9.99"
+      version: " - 2.99.99"
       reason: "only available in 3.0+"
       features: allowed_warnings
 

diff --git a/rest-api-spec/src/main/resources/rest-api-spec/test/pit/10_basic.yml b/rest-api-spec/src/main/resources/rest-api-spec/test/pit/10_basic.yml
@@ -96,7 +96,7 @@
 ---
 "Delete all":
   - skip:
-      version: " - 2.9.99"
+      version: " - 2.99.99"
       reason: "mode to be introduced later than 3.0"
   - do:
       indices.create:

diff --git a/...c/main/resources/rest-api-spec/test/search.aggregation/180_percentiles_tdigest_metric.yml b/...c/main/resources/rest-api-spec/test/search.aggregation/180_percentiles_tdigest_metric.yml
@@ -53,7 +53,7 @@ setup:
 
   - do:
       node_selector:
-        version: "- 2.9.99"
+        version: "- 2.99.99"
       search:
         rest_total_hits_as_int: true
         body:
@@ -88,7 +88,7 @@ setup:
 "Basic 3.x test":
 
   - skip:
-      version: "- 2.9.99"
+      version: "- 2.99.99"
       features: node_selector
       reason:  "t-digest 3.2 was interpolating leading to incorrect percentiles"
 
@@ -129,7 +129,7 @@ setup:
 "Compression test":
 
   - skip:
-      version: "- 2.9.99"
+      version: "- 2.99.99"
       features: node_selector
       reason:  "t-digest 3.2 was interpolating leading to incorrect percentiles"
 
@@ -174,7 +174,7 @@ setup:
 "Only aggs test":
 
   - skip:
-      version: "- 2.9.99"
+      version: "- 2.99.99"
       features: node_selector
       reason:  "t-digest 3.2 was interpolating leading to incorrect percentiles"
 
@@ -216,7 +216,7 @@ setup:
 "Filtered test":
 
   - skip:
-      version: "- 2.9.99"
+      version: "- 2.99.99"
       features: node_selector
       reason:  "t-digest 3.2 was interpolating leading to incorrect percentiles"
 
@@ -303,7 +303,7 @@ setup:
 "Metadata test":
 
   - skip:
-      version: "- 2.9.99"
+      version: "- 2.99.99"
       features: node_selector
       reason:  "t-digest 3.2 was interpolating leading to incorrect percentiles"
 
@@ -395,7 +395,7 @@ setup:
 "Explicit Percents test":
 
   - skip:
-      version: "- 2.9.99"
+      version: "- 2.99.99"
       features: node_selector
       reason:  "t-digest 3.2 was interpolating leading to incorrect percentiles"
 
@@ -431,7 +431,7 @@ setup:
 "Non-keyed test":
 
   - skip:
-      version: "- 2.9.99"
+      version: "- 2.99.99"
       features: node_selector
       reason:  "t-digest 3.2 was interpolating leading to incorrect percentiles"
 

diff --git a/...sources/rest-api-spec/test/search.aggregation/180_percentiles_tdigest_metric_unsigned.yml b/...sources/rest-api-spec/test/search.aggregation/180_percentiles_tdigest_metric_unsigned.yml
@@ -56,7 +56,7 @@ setup:
 
   - do:
       node_selector:
-        version: "- 2.9.99"
+        version: "- 2.99.99"
       search:
         rest_total_hits_as_int: true
         body:
@@ -136,7 +136,7 @@ setup:
 
   - do:
       node_selector:
-        version: "- 2.9.99"
+        version: "- 2.99.99"
       search:
         rest_total_hits_as_int: true
         body:
@@ -224,7 +224,7 @@ setup:
 
   - do:
       node_selector:
-        version: "- 2.9.99"
+        version: "- 2.99.99"
       search:
         rest_total_hits_as_int: true
         body:
@@ -306,7 +306,7 @@ setup:
 
   - do:
       node_selector:
-        version: "- 2.9.99"
+        version: "- 2.99.99"
       search:
         rest_total_hits_as_int: true
         body:
@@ -398,7 +398,7 @@ setup:
 
   - do:
       node_selector:
-        version: "- 2.9.99"
+        version: "- 2.99.99"
       search:
         rest_total_hits_as_int: true
         body:
@@ -464,7 +464,7 @@ setup:
 
   - do:
       node_selector:
-        version: "- 2.9.99"
+        version: "- 2.99.99"
       search:
         rest_total_hits_as_int: true
         body:
@@ -534,7 +534,7 @@ setup:
 
   - do:
       node_selector:
-        version: "- 2.9.99"
+        version: "- 2.99.99"
       search:
         rest_total_hits_as_int: true
         body: