Build: handle core's change to data directory

Core changed how the data directory is configured so we have to
conform to the new way.

Original commit: elastic/x-pack-elasticsearch@360e2fea1a
This commit is contained in:
Nik Everett 2017-05-26 13:32:39 -04:00
parent b215c66778
commit 43928708fa
1 changed files with 2 additions and 2 deletions

View File

@ -109,7 +109,7 @@ for (boolean withSystemKey: [true, false]) {
distribution = 'zip' distribution = 'zip'
clusterName = 'rolling-upgrade' clusterName = 'rolling-upgrade'
unicastTransportUri = { seedNode, node, ant -> oldClusterTest.nodes.get(0).transportUri() } unicastTransportUri = { seedNode, node, ant -> oldClusterTest.nodes.get(0).transportUri() }
dataDir = "${-> oldClusterTest.nodes[1].dataDir}" dataDir = { nodeNumber -> oldClusterTest.nodes[1].dataDir }
waitCondition = waitWithAuth waitCondition = waitWithAuth
setting 'xpack.ssl.keystore.path', 'testnode.jks' setting 'xpack.ssl.keystore.path', 'testnode.jks'
setting 'xpack.ssl.keystore.password', 'testnode' setting 'xpack.ssl.keystore.password', 'testnode'
@ -134,7 +134,7 @@ for (boolean withSystemKey: [true, false]) {
distribution = 'zip' distribution = 'zip'
clusterName = 'rolling-upgrade' clusterName = 'rolling-upgrade'
unicastTransportUri = { seedNode, node, ant -> mixedClusterTest.nodes.get(0).transportUri() } unicastTransportUri = { seedNode, node, ant -> mixedClusterTest.nodes.get(0).transportUri() }
dataDir = "${-> oldClusterTest.nodes[0].dataDir}" dataDir = { nodeNumber -> oldClusterTest.nodes[1].dataDir }
waitCondition = waitWithAuth waitCondition = waitWithAuth
setting 'xpack.ssl.keystore.path', 'testnode.jks' setting 'xpack.ssl.keystore.path', 'testnode.jks'
setting 'xpack.ssl.keystore.password', 'testnode' setting 'xpack.ssl.keystore.password', 'testnode'