Skip to content

Commit 62511c2

Browse files
committed
Change version handling in the tests
In the bcUpgradeTests these tests were previously skipped because version was set to `0.0.0` which was outside the supported range. Now, when `tests.old_cluster_version` has correct version they run, but fail just because `9.2.0-SNAPSHOT` was considered unsupported version format with the "SNAPSHOT".
1 parent 0bcc97f commit 62511c2

File tree

5 files changed

+5
-6
lines changed

5 files changed

+5
-6
lines changed

x-pack/plugin/esql/qa/server/mixed-cluster/src/javaRestTest/java/org/elasticsearch/xpack/esql/qa/mixed/MixedClusterEsqlSpecIT.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ protected String getTestRestCluster() {
3232
return cluster.getHttpAddresses();
3333
}
3434

35-
static final Version bwcVersion = Version.fromString(System.getProperty("tests.old_cluster_version"));
35+
static final Version bwcVersion = Version.fromString(System.getProperty("tests.old_cluster_version").replace("-SNAPSHOT", ""));
3636

3737
private static TestFeatureService oldClusterTestFeatureService = null;
3838

x-pack/plugin/inference/qa/mixed-cluster/src/javaRestTest/java/org/elasticsearch/xpack/inference/qa/mixed/CohereServiceMixedIT.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,9 @@
77

88
package org.elasticsearch.xpack.inference.qa.mixed;
99

10-
import org.elasticsearch.Version;
1110
import org.elasticsearch.common.Strings;
1211
import org.elasticsearch.inference.TaskType;
12+
import org.elasticsearch.test.cluster.util.Version;
1313
import org.elasticsearch.test.http.MockResponse;
1414
import org.elasticsearch.test.http.MockWebServer;
1515
import org.elasticsearch.xpack.inference.services.cohere.embeddings.CohereEmbeddingType;
@@ -21,7 +21,6 @@
2121
import java.util.List;
2222
import java.util.Map;
2323

24-
import static org.elasticsearch.xpack.inference.qa.mixed.MixedClusterSpecTestCase.bwcVersion;
2524
import static org.hamcrest.Matchers.containsString;
2625
import static org.hamcrest.Matchers.empty;
2726
import static org.hamcrest.Matchers.hasEntry;

x-pack/plugin/inference/qa/mixed-cluster/src/javaRestTest/java/org/elasticsearch/xpack/inference/qa/mixed/HuggingFaceServiceMixedIT.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,9 @@
77

88
package org.elasticsearch.xpack.inference.qa.mixed;
99

10-
import org.elasticsearch.Version;
1110
import org.elasticsearch.common.Strings;
1211
import org.elasticsearch.inference.TaskType;
12+
import org.elasticsearch.test.cluster.util.Version;
1313
import org.elasticsearch.test.http.MockResponse;
1414
import org.elasticsearch.test.http.MockWebServer;
1515
import org.junit.AfterClass;

x-pack/plugin/inference/qa/mixed-cluster/src/javaRestTest/java/org/elasticsearch/xpack/inference/qa/mixed/MixedClusterSpecTestCase.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,9 @@
77

88
package org.elasticsearch.xpack.inference.qa.mixed;
99

10-
import org.elasticsearch.Version;
1110
import org.elasticsearch.features.NodeFeature;
1211
import org.elasticsearch.test.cluster.ElasticsearchCluster;
12+
import org.elasticsearch.test.cluster.util.Version;
1313
import org.elasticsearch.test.rest.ESRestTestCase;
1414
import org.elasticsearch.test.rest.TestFeatureService;
1515
import org.junit.AfterClass;

x-pack/plugin/inference/qa/mixed-cluster/src/javaRestTest/java/org/elasticsearch/xpack/inference/qa/mixed/OpenAIServiceMixedIT.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,9 @@
77

88
package org.elasticsearch.xpack.inference.qa.mixed;
99

10-
import org.elasticsearch.Version;
1110
import org.elasticsearch.common.Strings;
1211
import org.elasticsearch.inference.TaskType;
12+
import org.elasticsearch.test.cluster.util.Version;
1313
import org.elasticsearch.test.http.MockResponse;
1414
import org.elasticsearch.test.http.MockWebServer;
1515
import org.junit.AfterClass;

0 commit comments

Comments
 (0)