From d7c097e2b47164e5ee9969b611b97b2ad3ef392e Mon Sep 17 00:00:00 2001 From: Ryan Ernst Date: Fri, 23 Feb 2018 18:17:59 -0800 Subject: [PATCH] Build: Remove specifying zip distribution in qa tests (elastic/x-pack-elasticsearch#4037) This is the xpack side of https://github.com/elastic/elasticsearch/pull/28805 Original commit: elastic/x-pack-elasticsearch@48cbe6623fa33d5e4ee518e74a071142194c47aa --- qa/full-cluster-restart/build.gradle | 2 -- qa/ml-basic-multi-node/build.gradle | 1 - qa/ml-disabled/build.gradle | 1 - qa/ml-native-tests/build.gradle | 1 - qa/multi-cluster-search-security/build.gradle | 2 -- qa/multi-node/build.gradle | 1 - qa/rolling-upgrade/build.gradle | 3 --- qa/sql/build.gradle | 2 -- 8 files changed, 13 deletions(-) diff --git a/qa/full-cluster-restart/build.gradle b/qa/full-cluster-restart/build.gradle index c753bf0ab4c..2dd380af818 100644 --- a/qa/full-cluster-restart/build.gradle +++ b/qa/full-cluster-restart/build.gradle @@ -141,7 +141,6 @@ subprojects { configure(extensions.findByName("${baseName}#oldClusterTestCluster")) { dependsOn copyTestNodeKeystore plugin xpackProject('plugin').path - distribution = 'zip' bwcVersion = version numBwcNodes = 2 numNodes = 2 @@ -192,7 +191,6 @@ subprojects { "${baseName}#oldClusterTestCluster#node0.stop", "${baseName}#oldClusterTestCluster#node1.stop" plugin xpackProject('plugin').path - distribution = 'zip' numNodes = 2 clusterName = 'full-cluster-restart' dataDir = { nodeNum -> oldClusterTest.nodes[nodeNum].dataDir } diff --git a/qa/ml-basic-multi-node/build.gradle b/qa/ml-basic-multi-node/build.gradle index 597035d2e88..3953567fcf8 100644 --- a/qa/ml-basic-multi-node/build.gradle +++ b/qa/ml-basic-multi-node/build.gradle @@ -13,6 +13,5 @@ integTestCluster { setting 'xpack.ml.enabled', 'true' setting 'xpack.license.self_generated.type', 'trial' numNodes = 3 - distribution = 'zip' plugin xpackProject('plugin').path } diff --git a/qa/ml-disabled/build.gradle b/qa/ml-disabled/build.gradle index 34cb9a12d35..22231c636b4 100644 --- a/qa/ml-disabled/build.gradle +++ b/qa/ml-disabled/build.gradle @@ -10,6 +10,5 @@ integTestCluster { setting 'xpack.security.enabled', 'false' setting 'xpack.ml.enabled', 'false' numNodes = 1 - distribution = 'zip' plugin xpackProject('plugin').path } diff --git a/qa/ml-native-tests/build.gradle b/qa/ml-native-tests/build.gradle index f558bee8793..701cafdfa95 100644 --- a/qa/ml-native-tests/build.gradle +++ b/qa/ml-native-tests/build.gradle @@ -64,7 +64,6 @@ integTestCluster { keystoreSetting 'bootstrap.password', 'x-pack-test-password' keystoreSetting 'xpack.security.transport.ssl.keystore.secure_password', 'keypass' - distribution = 'zip' // this is important since we use the reindex module in ML setupCommand 'setupDummyUser', 'bin/x-pack/users', 'useradd', 'x_pack_rest_user', '-p', 'x-pack-test-password', '-r', 'superuser' diff --git a/qa/multi-cluster-search-security/build.gradle b/qa/multi-cluster-search-security/build.gradle index 6040c3004cc..7d08049bbc2 100644 --- a/qa/multi-cluster-search-security/build.gradle +++ b/qa/multi-cluster-search-security/build.gradle @@ -12,7 +12,6 @@ task remoteClusterTest(type: RestIntegTestTask) { } remoteClusterTestCluster { - distribution = 'zip' numNodes = 2 clusterName = 'remote-cluster' setting 'search.remote.connect', false @@ -60,7 +59,6 @@ mixedClusterTestCluster { retries: 10) return tmpFile.exists() } - distribution = 'zip' setting 'search.remote.my_remote_cluster.seeds', "\"${-> remoteClusterTest.nodes.get(0).transportUri()}\"" setting 'search.remote.connections_per_cluster', 1 setting 'search.remote.connect', true diff --git a/qa/multi-node/build.gradle b/qa/multi-node/build.gradle index 5b03d3df731..b0e4dc82cc9 100644 --- a/qa/multi-node/build.gradle +++ b/qa/multi-node/build.gradle @@ -6,7 +6,6 @@ dependencies { } integTestCluster { - distribution = 'zip' numNodes = 2 clusterName = 'multi-node' plugin xpackProject('plugin').path diff --git a/qa/rolling-upgrade/build.gradle b/qa/rolling-upgrade/build.gradle index f7816e954f7..9554bb5bf68 100644 --- a/qa/rolling-upgrade/build.gradle +++ b/qa/rolling-upgrade/build.gradle @@ -124,7 +124,6 @@ subprojects { dependsOn copyTestNodeKeystore plugin xpackProject('plugin').path setupCommand 'setupTestUser', 'bin/x-pack/users', 'useradd', 'test_user', '-p', 'x-pack-test-password', '-r', 'superuser' - distribution = 'zip' bwcVersion = version numBwcNodes = 2 numNodes = 2 @@ -171,7 +170,6 @@ subprojects { dependsOn oldClusterTestRunner, "${baseName}#oldClusterTestCluster#node1.stop" plugin xpackProject('plugin').path setupCommand 'setupTestUser', 'bin/x-pack/users', 'useradd', 'test_user', '-p', 'x-pack-test-password', '-r', 'superuser' - distribution = 'zip' clusterName = 'rolling-upgrade' unicastTransportUri = { seedNode, node, ant -> oldClusterTest.nodes.get(0).transportUri() } minimumMasterNodes = { 2 } @@ -211,7 +209,6 @@ subprojects { dependsOn(mixedClusterTestRunner, "${baseName}#oldClusterTestCluster#node0.stop") plugin xpackProject('plugin').path setupCommand 'setupTestUser', 'bin/x-pack/users', 'useradd', 'test_user', '-p', 'x-pack-test-password', '-r', 'superuser' - distribution = 'zip' clusterName = 'rolling-upgrade' unicastTransportUri = { seedNode, node, ant -> mixedClusterTest.nodes.get(0).transportUri() } minimumMasterNodes = { 2 } diff --git a/qa/sql/build.gradle b/qa/sql/build.gradle index 81ae67ed51e..60a2d1aa2c4 100644 --- a/qa/sql/build.gradle +++ b/qa/sql/build.gradle @@ -103,7 +103,6 @@ subprojects { } integTestCluster { - distribution = 'zip' plugin xpackProject('plugin').path setting 'xpack.monitoring.enabled', 'false' setting 'xpack.ml.enabled', 'false' @@ -118,7 +117,6 @@ subprojects { } task runqa(type: RunTask) { - distribution = 'zip' plugin xpackProject('plugin').path setting 'xpack.monitoring.enabled', 'false' setting 'xpack.ml.enabled', 'false'