From b456885b39aa243f01f0cabee1f88e045786aa44 Mon Sep 17 00:00:00 2001
From: jaymode <jay@elastic.co>
Date: Wed, 24 Jan 2018 16:30:02 -0700
Subject: [PATCH] Test: increase time to wait for tribe tests with security

There have been some failures in CI due to the tribe tests with security taking too long for the
cluster to form and the expected number of node to join. In the thread dumps of the failure, it
can be seen that a node is still initializing and is in a method that could take a decent amount
of time on slow machines (TokenService#computeSecretKey). This commit increases the wait time to
allow for the node to startup and join.

Original commit: elastic/x-pack-elasticsearch@2bf4c96d8fa5158ea68b5cde9263ee1707afcf90
---
 qa/tribe-tests-with-security/build.gradle | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/qa/tribe-tests-with-security/build.gradle b/qa/tribe-tests-with-security/build.gradle
index 18889359e0f..c3ffda592ee 100644
--- a/qa/tribe-tests-with-security/build.gradle
+++ b/qa/tribe-tests-with-security/build.gradle
@@ -46,7 +46,7 @@ configOne.setupCommand('setupDummyUser',
         'bin/x-pack/users', 'useradd', 'test_user', '-p', 'x-pack-test-password', '-r', 'superuser')
 configOne.waitCondition = { node, ant ->
     File tmpFile = new File(node.cwd, 'wait.success')
-    ant.get(src: "http://${node.httpUri()}/_cluster/health?wait_for_nodes=>=1&wait_for_status=yellow",
+    ant.get(src: "http://${node.httpUri()}/_cluster/health?wait_for_nodes=>=1&wait_for_status=yellow&timeout=60s",
             dest: tmpFile.toString(),
             username: 'test_user',
             password: 'x-pack-test-password',
@@ -68,7 +68,7 @@ configTwo.setupCommand('setupDummyUser',
         'bin/x-pack/users', 'useradd', 'test_user', '-p', 'x-pack-test-password', '-r', 'superuser')
 configTwo.waitCondition = { node, ant ->
     File tmpFile = new File(node.cwd, 'wait.success')
-    ant.get(src: "http://${node.httpUri()}/_cluster/health?wait_for_nodes=>=1&wait_for_status=yellow",
+    ant.get(src: "http://${node.httpUri()}/_cluster/health?wait_for_nodes=>=1&wait_for_status=yellow&timeout=60s",
             dest: tmpFile.toString(),
             username: 'test_user',
             password: 'x-pack-test-password',
@@ -99,7 +99,7 @@ integTestCluster {
     waitCondition = { node, ant ->
         File tmpFile = new File(node.cwd, 'wait.success')
         // 5 nodes: tribe + clusterOne (1 node + tribe internal node) + clusterTwo (1 node + tribe internal node)
-        ant.get(src: "http://${node.httpUri()}/_cluster/health?wait_for_nodes=>=5&wait_for_status=yellow",
+        ant.get(src: "http://${node.httpUri()}/_cluster/health?wait_for_nodes=>=5&wait_for_status=yellow&timeout=60s",
                 dest: tmpFile.toString(),
                 username: 'test_user',
                 password: 'x-pack-test-password',