honeymoose
/
OpenSearch
mirror of https://github.com/honeymoose/OpenSearch.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix tribe test setup to look for a single node 

numNodes isn't available because it is not in the normal context of
cluster configuration.

relates elastic/x-pack-elasticsearch#740

Original commit: elastic/x-pack-elasticsearch@336147f20c
This commit is contained in:
Ryan Ernst 2017-03-15 15:55:10 -07:00
parent 534584d525
commit baaad36c5e
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
qa/tribe-tests-with-security/build.gradle
View File

@ -20,7 +20,7 @@ configOne.setupCommand('setupDummyUser',
'bin/x-pack/users', 'useradd', 'test_user', '-p', 'changeme', '-r', 'superuser') 'bin/x-pack/users', 'useradd', 'test_user', '-p', 'changeme', '-r', 'superuser')
configOne.waitCondition = { node, ant -> configOne.waitCondition = { node, ant ->
File tmpFile = new File(node.cwd, 'wait.success') File tmpFile = new File(node.cwd, 'wait.success')
ant.get(src: "http://${node.httpUri()}/_cluster/health?wait_for_nodes=>=${numNodes}&wait_for_status=yellow", ant.get(src: "http://${node.httpUri()}/_cluster/health?wait_for_nodes=>=1&wait_for_status=yellow",
dest: tmpFile.toString(), dest: tmpFile.toString(),
username: 'test_user', username: 'test_user',
password: 'changeme', password: 'changeme',
@ -40,7 +40,7 @@ configTwo.setupCommand('setupDummyUser',
'bin/x-pack/users', 'useradd', 'test_user', '-p', 'changeme', '-r', 'superuser') 'bin/x-pack/users', 'useradd', 'test_user', '-p', 'changeme', '-r', 'superuser')
configTwo.waitCondition = { node, ant -> configTwo.waitCondition = { node, ant ->
File tmpFile = new File(node.cwd, 'wait.success') File tmpFile = new File(node.cwd, 'wait.success')
ant.get(src: "http://${node.httpUri()}/_cluster/health?wait_for_nodes=>=${numNodes}&wait_for_status=yellow", ant.get(src: "http://${node.httpUri()}/_cluster/health?wait_for_nodes=>=1&wait_for_status=yellow",
dest: tmpFile.toString(), dest: tmpFile.toString(),
username: 'test_user', username: 'test_user',
password: 'changeme', password: 'changeme',
@ -68,7 +68,7 @@ integTestCluster {
setting 'tribe.cluster2.xpack.ml.enabled', 'false' setting 'tribe.cluster2.xpack.ml.enabled', 'false'
waitCondition = { node, ant -> waitCondition = { node, ant ->
File tmpFile = new File(node.cwd, 'wait.success') File tmpFile = new File(node.cwd, 'wait.success')
ant.get(src: "http://${node.httpUri()}/_cluster/health?wait_for_nodes=>=${numNodes}&wait_for_status=yellow", ant.get(src: "http://${node.httpUri()}/_cluster/health?wait_for_nodes=>=1&wait_for_status=yellow",
dest: tmpFile.toString(), dest: tmpFile.toString(),
username: 'test_user', username: 'test_user',
password: 'changeme', password: 'changeme',