[TEST] Wait in rolling_upgrade rest test for monitoring indices to be fully allocated

Fixes previous commit elastic/x-pack@8bb4e6a so that it also accounts for monitoring indices that are automatically created by x-pack while the test is running. Original commit: elastic/x-pack-elasticsearch@e50e1a2717
2016-11-25 12:53:36 +01:00 · 2016-11-25 12:53:36 +01:00 · c7d7a2bafc
parent 16b624b1e4
commit c7d7a2bafc
1 changed files with 4 additions and 3 deletions
--- a/qa/rolling-upgrade/src/test/resources/rest-api-spec/test/old_cluster/10_basic.yaml
+++ b/qa/rolling-upgrade/src/test/resources/rest-api-spec/test/old_cluster/10_basic.yaml
@ -3,6 +3,7 @@
 - do:
     indices.create:
        index: test_index
+        wait_for_active_shards : all
        body:
          settings:
            index:
@ -35,6 +36,6 @@

 - do:
     cluster.health:
-       wait_for_status: green
-       wait_for_nodes: 2
-       timeout: 25s
+        index: ".monitoring-*" # include monitoring-data-* and monitoring-es-*
+        wait_for_active_shards: 4 # 1 primary and 1 replica each for the two monitoring indices
+        timeout: 25s