Check old cluster version to determine if is snapshot build

jordan-powers · jordan-powers · commit 30f384b73495 · 2025-09-26T07:59:28.000-07:00
diff --git a/x-pack/plugin/logsdb/qa/rolling-upgrade/src/javaRestTest/java/org/elasticsearch/upgrades/LogsUsageRollingUpgradeIT.java b/x-pack/plugin/logsdb/qa/rolling-upgrade/src/javaRestTest/java/org/elasticsearch/upgrades/LogsUsageRollingUpgradeIT.java
@@ -11,7 +11,6 @@
 
 import com.carrotsearch.randomizedtesting.annotations.Name;
 
-import org.elasticsearch.Build;
 import org.elasticsearch.client.Request;
 
 import java.io.IOException;
@@ -32,7 +31,7 @@ public LogsUsageRollingUpgradeIT(@Name("upgradedNodes") int upgradedNodes) {
 
     @Override
     protected void beforeUpgrade() {
-        if (Build.current().isSnapshot()) {
+        if (getOldClusterVersion().endsWith("-SNAPSHOT")) {
             assumeTrue("rename of pattern_text mapper", oldClusterHasFeature("mapper.pattern_text_rename"));
         }
     }
diff --git a/x-pack/plugin/logsdb/qa/rolling-upgrade/src/javaRestTest/java/org/elasticsearch/upgrades/LogsdbIndexingRollingUpgradeIT.java b/x-pack/plugin/logsdb/qa/rolling-upgrade/src/javaRestTest/java/org/elasticsearch/upgrades/LogsdbIndexingRollingUpgradeIT.java
@@ -11,7 +11,6 @@
 
 import com.carrotsearch.randomizedtesting.annotations.Name;
 
-import org.elasticsearch.Build;
 import org.elasticsearch.client.Request;
 import org.elasticsearch.client.Response;
 import org.elasticsearch.client.ResponseException;
@@ -77,7 +76,7 @@ public LogsdbIndexingRollingUpgradeIT(@Name("upgradedNodes") int upgradedNodes)
 
     @Override
     protected void beforeUpgrade() {
-        if (Build.current().isSnapshot()) {
+        if (getOldClusterVersion().endsWith("-SNAPSHOT")) {
             assumeTrue("rename of pattern_text mapper", oldClusterHasFeature("mapper.pattern_text_rename"));
         }
     }
diff --git a/x-pack/plugin/logsdb/qa/rolling-upgrade/src/javaRestTest/java/org/elasticsearch/upgrades/MatchOnlyTextRollingUpgradeIT.java b/x-pack/plugin/logsdb/qa/rolling-upgrade/src/javaRestTest/java/org/elasticsearch/upgrades/MatchOnlyTextRollingUpgradeIT.java
@@ -11,7 +11,6 @@
 
 import com.carrotsearch.randomizedtesting.annotations.Name;
 
-import org.elasticsearch.Build;
 import org.elasticsearch.client.Request;
 import org.elasticsearch.client.Response;
 import org.elasticsearch.client.ResponseException;
@@ -93,7 +92,7 @@ public MatchOnlyTextRollingUpgradeIT(@Name("upgradedNodes") int upgradedNodes) {
 
     @Override
     protected void beforeUpgrade() {
-        if (Build.current().isSnapshot()) {
+        if (getOldClusterVersion().endsWith("-SNAPSHOT")) {
             assumeTrue("rename of pattern_text mapper", oldClusterHasFeature("mapper.pattern_text_rename"));
         }
     }
diff --git a/x-pack/plugin/logsdb/qa/rolling-upgrade/src/javaRestTest/java/org/elasticsearch/upgrades/NoLogsUsageRollingUpgradeIT.java b/x-pack/plugin/logsdb/qa/rolling-upgrade/src/javaRestTest/java/org/elasticsearch/upgrades/NoLogsUsageRollingUpgradeIT.java
@@ -11,8 +11,6 @@
 
 import com.carrotsearch.randomizedtesting.annotations.Name;
 
-import org.elasticsearch.Build;
-
 import java.time.Instant;
 import java.util.Map;
 
@@ -30,7 +28,7 @@ public NoLogsUsageRollingUpgradeIT(@Name("upgradedNodes") int upgradedNodes) {
 
     @Override
     protected void beforeUpgrade() {
-        if (Build.current().isSnapshot()) {
+        if (getOldClusterVersion().endsWith("-SNAPSHOT")) {
             assumeTrue("rename of pattern_text mapper", oldClusterHasFeature("mapper.pattern_text_rename"));
         }
     }
diff --git a/x-pack/plugin/logsdb/qa/rolling-upgrade/src/javaRestTest/java/org/elasticsearch/upgrades/StandardToLogsDbIndexModeRollingUpgradeIT.java b/x-pack/plugin/logsdb/qa/rolling-upgrade/src/javaRestTest/java/org/elasticsearch/upgrades/StandardToLogsDbIndexModeRollingUpgradeIT.java
@@ -11,7 +11,6 @@
 
 import com.carrotsearch.randomizedtesting.annotations.Name;
 
-import org.elasticsearch.Build;
 import org.elasticsearch.client.Request;
 import org.elasticsearch.client.Response;
 import org.elasticsearch.client.RestClient;
@@ -117,7 +116,7 @@ protected Settings restClientSettings() {
 
     @Override
     protected void beforeUpgrade() {
-        if (Build.current().isSnapshot()) {
+        if (getOldClusterVersion().endsWith("-SNAPSHOT")) {
             assumeTrue("rename of pattern_text mapper", oldClusterHasFeature("mapper.pattern_text_rename"));
         }
     }
diff --git a/x-pack/plugin/logsdb/qa/rolling-upgrade/src/javaRestTest/java/org/elasticsearch/upgrades/SyntheticSourceRollingUpgradeIT.java b/x-pack/plugin/logsdb/qa/rolling-upgrade/src/javaRestTest/java/org/elasticsearch/upgrades/SyntheticSourceRollingUpgradeIT.java
@@ -11,7 +11,6 @@
 
 import com.carrotsearch.randomizedtesting.annotations.Name;
 
-import org.elasticsearch.Build;
 import org.elasticsearch.client.Request;
 import org.elasticsearch.test.rest.ObjectPath;
 import org.hamcrest.Matchers;
@@ -73,7 +72,7 @@ public SyntheticSourceRollingUpgradeIT(@Name("upgradedNodes") int upgradedNodes)
 
     @Override
     protected void beforeUpgrade() {
-        if (Build.current().isSnapshot()) {
+        if (getOldClusterVersion().endsWith("-SNAPSHOT")) {
             assumeTrue("rename of pattern_text mapper", oldClusterHasFeature("mapper.pattern_text_rename"));
         }
     }
diff --git a/x-pack/plugin/logsdb/qa/rolling-upgrade/src/javaRestTest/java/org/elasticsearch/upgrades/TextRollingUpgradeIT.java b/x-pack/plugin/logsdb/qa/rolling-upgrade/src/javaRestTest/java/org/elasticsearch/upgrades/TextRollingUpgradeIT.java
@@ -9,7 +9,6 @@
 
 import com.carrotsearch.randomizedtesting.annotations.Name;
 
-import org.elasticsearch.Build;
 import org.elasticsearch.client.Request;
 import org.elasticsearch.client.Response;
 import org.elasticsearch.client.ResponseException;
@@ -90,7 +89,7 @@ public TextRollingUpgradeIT(@Name("upgradedNodes") int upgradedNodes) {
 
     @Override
     protected void beforeUpgrade() {
-        if (Build.current().isSnapshot()) {
+        if (getOldClusterVersion().endsWith("-SNAPSHOT")) {
             assumeTrue("rename of pattern_text mapper", oldClusterHasFeature("mapper.pattern_text_rename"));
         }
     }

Original file line number	Diff line number	Diff line change
`@@ -11,7 +11,6 @@`
`11`	`11`
`12`	`12`	`import com.carrotsearch.randomizedtesting.annotations.Name;`
`13`	`13`
`14`		`-import org.elasticsearch.Build;`
`15`	`14`	`import org.elasticsearch.client.Request;`
`16`	`15`
`17`	`16`	`import java.io.IOException;`
`@@ -32,7 +31,7 @@ public LogsUsageRollingUpgradeIT(@Name("upgradedNodes") int upgradedNodes) {`
`32`	`31`
`33`	`32`	`@Override`
`34`	`33`	`protected void beforeUpgrade() {`
`35`		`- if (Build.current().isSnapshot()) {`
	`34`	`+ if (getOldClusterVersion().endsWith("-SNAPSHOT")) {`
`36`	`35`	`assumeTrue("rename of pattern_text mapper", oldClusterHasFeature("mapper.pattern_text_rename"));`
`37`	`36`	`}`
`38`	`37`	`}`
Original file line number	Diff line number	Diff line change
`@@ -11,8 +11,6 @@`
`11`	`11`
`12`	`12`	`import com.carrotsearch.randomizedtesting.annotations.Name;`
`13`	`13`
`14`		`-import org.elasticsearch.Build;`
`15`		`-`
`16`	`14`	`import java.time.Instant;`
`17`	`15`	`import java.util.Map;`
`18`	`16`
`@@ -30,7 +28,7 @@ public NoLogsUsageRollingUpgradeIT(@Name("upgradedNodes") int upgradedNodes) {`
`30`	`28`
`31`	`29`	`@Override`
`32`	`30`	`protected void beforeUpgrade() {`
`33`		`- if (Build.current().isSnapshot()) {`
	`31`	`+ if (getOldClusterVersion().endsWith("-SNAPSHOT")) {`
`34`	`32`	`assumeTrue("rename of pattern_text mapper", oldClusterHasFeature("mapper.pattern_text_rename"));`
`35`	`33`	`}`
`36`	`34`	`}`
Original file line number	Diff line number	Diff line change
`@@ -9,7 +9,6 @@`
`9`	`9`
`10`	`10`	`import com.carrotsearch.randomizedtesting.annotations.Name;`
`11`	`11`
`12`		`-import org.elasticsearch.Build;`
`13`	`12`	`import org.elasticsearch.client.Request;`
`14`	`13`	`import org.elasticsearch.client.Response;`
`15`	`14`	`import org.elasticsearch.client.ResponseException;`
`@@ -90,7 +89,7 @@ public TextRollingUpgradeIT(@Name("upgradedNodes") int upgradedNodes) {`
`90`	`89`
`91`	`90`	`@Override`
`92`	`91`	`protected void beforeUpgrade() {`
`93`		`- if (Build.current().isSnapshot()) {`
	`92`	`+ if (getOldClusterVersion().endsWith("-SNAPSHOT")) {`
`94`	`93`	`assumeTrue("rename of pattern_text mapper", oldClusterHasFeature("mapper.pattern_text_rename"));`
`95`	`94`	`}`
`96`	`95`	`}`