Move integ test runner deps to cluster deps (elastic/x-pack-elasticsearch#1096)

This is the xpack side of elastic/elasticsearch#24142

Original commit: elastic/x-pack-elasticsearch@d502f06cea

qa/multi-cluster-search-security/build.gradle

@@ -38,11 +38,10 @@ remoteClusterTestRunner {
   systemProperty 'tests.rest.suite', 'remote_cluster'
 }
 
-task mixedClusterTest(type: RestIntegTestTask) {
+task mixedClusterTest(type: RestIntegTestTask) {}
-  dependsOn(remoteClusterTestRunner)
-}
 
 mixedClusterTestCluster {
+  dependsOn remoteClusterTestRunner
   plugin ':x-pack-elasticsearch:plugin'
   setting 'xpack.watcher.enabled', 'false'
   setting 'xpack.monitoring.enabled', 'false'

qa/rolling-upgrade/build.gradle

@@ -71,11 +71,10 @@ oldClusterTestRunner {
   systemProperty 'tests.rest.suite', 'old_cluster'
 }
 
-task mixedClusterTest(type: RestIntegTestTask) {
+task mixedClusterTest(type: RestIntegTestTask) {}
-    dependsOn(oldClusterTestRunner, 'oldClusterTestCluster#node1.stop')
-}
 
 mixedClusterTestCluster {
+    dependsOn oldClusterTestRunner, 'oldClusterTestCluster#node1.stop'
     plugin ':x-pack-elasticsearch:plugin'
     distribution = 'zip'
     clusterName = 'rolling-upgrade'
@@ -92,11 +91,10 @@ mixedClusterTestRunner {
     finalizedBy 'oldClusterTestCluster#node0.stop'
 }
 
-task upgradedClusterTest(type: RestIntegTestTask) {
+task upgradedClusterTest(type: RestIntegTestTask) {}
-    dependsOn(mixedClusterTestRunner, 'oldClusterTestCluster#node0.stop')
-}
 
 upgradedClusterTestCluster {
+    dependsOn mixedClusterTestRunner, 'oldClusterTestCluster#node0.stop'
     plugin ':x-pack-elasticsearch:plugin'
     distribution = 'zip'
     clusterName = 'rolling-upgrade'

qa/security-example-extension/build.gradle

@@ -43,7 +43,7 @@ task buildZip(type:Zip, dependsOn: [jar]) {
   from project.jar
 }
 
-task integTest(type: org.elasticsearch.gradle.test.RestIntegTestTask, dependsOn: buildZip) {
+task integTest(type: org.elasticsearch.gradle.test.RestIntegTestTask) {
   mustRunAfter precommit
 }
 
@@ -51,6 +51,7 @@ integTestRunner {
   systemProperty 'tests.security.manager', 'false'
 }
 integTestCluster {
+  dependsOn buildZip
   plugin ':x-pack-elasticsearch:plugin'
   setting 'xpack.security.authc.realms.custom.order', '0'
   setting 'xpack.security.authc.realms.custom.type', 'custom'

qa/smoke-test-graph-with-security/build.gradle

@@ -12,11 +12,8 @@ task copyGraphRestTests(type: Copy) {
   include 'rest-api-spec/test/graph/**'
 }
 
-integTest {
-  dependsOn copyGraphRestTests
-}
-
 integTestCluster {
+  dependsOn copyGraphRestTests
   plugin ':x-pack-elasticsearch:plugin'
   extraConfigFile 'x-pack/roles.yml', 'roles.yml'
   setupCommand 'setupTestAdminUser',

qa/smoke-test-ml-with-security/build.gradle

@@ -12,10 +12,6 @@ task copyMlRestTests(type: Copy) {
   include 'rest-api-spec/test/ml/**'
 }
 
-integTest {
-  dependsOn copyMlRestTests
-}
-
 integTestRunner {
   systemProperty 'tests.rest.blacklist', [
     // Remove tests that are expected to throw an exception, because we cannot then
@@ -59,6 +55,7 @@ integTestRunner {
 }
 
 integTestCluster {
+  dependsOn copyMlRestTests
   plugin ':x-pack-elasticsearch:plugin'
   extraConfigFile 'x-pack/roles.yml', 'roles.yml'
   setupCommand 'setupTestAdminUser',

qa/smoke-test-watcher-with-security/build.gradle

@@ -12,10 +12,6 @@ task copyWatcherRestTests(type: Copy) {
   include 'rest-api-spec/test/watcher/**'
 }
 
-integTest {
-  dependsOn copyWatcherRestTests
-}
-
 integTestRunner {
   systemProperty 'tests.rest.blacklist',
     ['hijack/10_basic/*',
@@ -23,6 +19,7 @@ integTestRunner {
 }
 
 integTestCluster {
+  dependsOn copyWatcherRestTests
   plugin ':x-pack-elasticsearch:plugin'
   extraConfigFile 'x-pack/roles.yml', 'roles.yml'
   setupCommand 'setupTestAdminUser',

qa/tribe-tests-with-license/build.gradle

@@ -41,6 +41,7 @@ cluster2Config.setting('xpack.ml.enabled', false)
 List<NodeInfo> cluster2Nodes = ClusterFormationTasks.setup(project, 'clusterTwo', setupClusterTwo, cluster2Config)
 
 integTestCluster {
+  dependsOn setupClusterOne, setupClusterTwo
   setting 'node.name', 'tribe-node'
   setting 'tribe.on_conflict', 'prefer_cluster1'
   setting 'tribe.cluster1.cluster.name', 'cluster1'
@@ -72,7 +73,6 @@ integTestCluster {
 }
 
 integTestRunner {
-  dependsOn(setupClusterOne, setupClusterTwo)
   systemProperty 'tests.cluster', "${-> cluster1Nodes.get(0).transportUri()}"
   systemProperty 'tests.cluster2', "${-> cluster2Nodes.get(0).transportUri()}"
   systemProperty 'tests.tribe', "${-> integTest.nodes.get(0).transportUri()}"

qa/tribe-tests-with-security/build.gradle

@@ -53,6 +53,7 @@ configTwo.waitCondition = { node, ant ->
 List<NodeInfo> cluster2Nodes = ClusterFormationTasks.setup(project, 'clusterTwo', setupClusterTwo, configTwo)
 
 integTestCluster {
+    dependsOn setupClusterOne, setupClusterTwo
     plugin ':x-pack-elasticsearch:plugin'
     setupCommand 'setupDummyUser',
             'bin/x-pack/users', 'useradd', 'test_user', '-p', 'changeme', '-r', 'superuser'
@@ -81,7 +82,6 @@ integTestCluster {
 }
 
 integTestRunner {
-    dependsOn(setupClusterOne, setupClusterTwo)
     systemProperty 'tests.cluster', "${-> cluster1Nodes.get(0).transportUri()}"
     systemProperty 'tests.cluster2', "${-> cluster2Nodes.get(0).transportUri()}"
     systemProperty 'tests.tribe', "${-> integTest.nodes.get(0).transportUri()}"