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@48cbe6623f
This commit is contained in:
parent
e3543b06ba
commit
d7c097e2b4
|
@ -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 }
|
||||
|
|
|
@ -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
|
||||
}
|
||||
|
|
|
@ -10,6 +10,5 @@ integTestCluster {
|
|||
setting 'xpack.security.enabled', 'false'
|
||||
setting 'xpack.ml.enabled', 'false'
|
||||
numNodes = 1
|
||||
distribution = 'zip'
|
||||
plugin xpackProject('plugin').path
|
||||
}
|
||||
|
|
|
@ -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'
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -6,7 +6,6 @@ dependencies {
|
|||
}
|
||||
|
||||
integTestCluster {
|
||||
distribution = 'zip'
|
||||
numNodes = 2
|
||||
clusterName = 'multi-node'
|
||||
plugin xpackProject('plugin').path
|
||||
|
|
|
@ -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 }
|
||||
|
|
|
@ -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'
|
||||
|
|
Loading…
Reference in New Issue