move restart into its own package

kderusso · Mar 8, 2024 · 6393493 · 6393493
1 parent fbc562e
commit 6393493
Show file tree

Hide file tree

Showing 4 changed files with 20 additions and 2 deletions.
diff --git a/x-pack/plugin/ml/qa/build.gradle b/x-pack/plugin/ml/qa/build.gradle
@@ -0,0 +1 @@
+
diff --git a/x-pack/plugin/ml/qa/full-cluster-restart/build.gradle b/x-pack/plugin/ml/qa/full-cluster-restart/build.gradle
@@ -0,0 +1,18 @@
+apply plugin: 'elasticsearch.internal-java-rest-test'
+apply plugin: 'elasticsearch.bwc-test'
+
+dependencies {
+  javaRestTestImplementation(testArtifact(project(xpackModule('core'))))
+  javaRestTestImplementation(testArtifact(project(xpackModule('ml'))))
+  javaRestTestImplementation(testArtifact(project(":qa:full-cluster-restart"), "javaRestTest"))
+}
+
+assert Version.fromString(VersionProperties.getVersions().get("elasticsearch")).getMajor() == 8:
+  "If we are targeting a branch other than 8, we should enable migration tests"
+
+BuildParams.bwcVersions.withWireCompatible(v -> v.after("8.8.0")) { bwcVersion, baseName ->
+  tasks.register(bwcTaskName(bwcVersion), StandaloneRestIntegTestTask) {
+    usesBwcDistribution(bwcVersion)
+    systemProperty("tests.old_cluster_version", bwcVersion)
+  }
+}
diff --git a/...on/TextExpansionFullClusterRestartIT.java → ...on/TextExpansionFullClusterRestartIT.java b/...on/TextExpansionFullClusterRestartIT.java → ...on/TextExpansionFullClusterRestartIT.java
@@ -10,6 +10,7 @@
 import com.carrotsearch.randomizedtesting.annotations.Name;
 
 import org.elasticsearch.Version;
+import org.elasticsearch.gradle.testclusters.ElasticsearchCluster;
 import org.junit.ClassRule;
 
 import static org.apache.lucene.tests.util.LuceneTestCase.assumeTrue;

diff --git a/x-pack/plugin/ml/qa/native-multi-node-tests/build.gradle b/x-pack/plugin/ml/qa/native-multi-node-tests/build.gradle
@@ -1,5 +1,4 @@
 apply plugin: 'elasticsearch.legacy-java-rest-test'
-apply plugin: 'elasticsearch.bwc-test'
 
 dependencies {
   javaRestTestImplementation(testArtifact(project(xpackModule('core'))))
@@ -16,7 +15,6 @@ dependencies {
   javaRestTestImplementation project(path: xpackModule('monitoring'))
   javaRestTestImplementation project(path: xpackModule('transform'))
   javaRestTestImplementation project(path: xpackModule('rank-rrf'))
-  javaRestTestImplementation(testArtifact(project(":qa:full-cluster-restart"), "javaRestTest"))
 }
 
 // location for keys and certificates