Change status and wait for active shards

Author: carlosdelest

rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/synonyms/110_synonyms_invalid.yml

@@ -11,13 +11,14 @@ setup:
           synonyms_set:
             synonyms: "foo => bar, baz"
 
-  # This is to ensure that all index shards (write and read) are available. In serverless this can take some time.
+  # This is to ensure that at least two index shards (write and read) are available. In serverless this can take some time.
   - do:
       cluster.health:
         index: .synonyms-2
         level: shards
+        wait_for_active_shards: 2
         timeout: 1m
-        wait_for_status: green
+        wait_for_status: yellow
 
   - do:
       indices.create:

rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/synonyms/20_synonyms_get.yml

@@ -14,13 +14,14 @@ setup:
             - synonyms: "test => check"
               id: "test-id-3"
 
-  # This is to ensure that all index shards (write and read) are available. In serverless this can take some time.
+  # This is to ensure that at least two index shards (write and read) are available. In serverless this can take some time.
   - do:
       cluster.health:
         index: .synonyms-2
         level: shards
+        wait_for_active_shards: 2
         timeout: 1m
-        wait_for_status: green
+        wait_for_status: yellow
 
 ---
 "Get synonyms set":

rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/synonyms/30_synonyms_delete.yml

@@ -12,13 +12,14 @@ setup:
             - synonyms: "bye => goodbye"
               id: "test-id-2"
 
-  # This is to ensure that all index shards (write and read) are available. In serverless this can take some time.
+  # This is to ensure that at least two index shards (write and read) are available. In serverless this can take some time.
   - do:
       cluster.health:
         index: .synonyms-2
         level: shards
+        wait_for_active_shards: 2
         timeout: 1m
-        wait_for_status: green
+        wait_for_status: yellow
 
 ---
 "Delete synonyms set":

rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/synonyms/40_synonyms_sets_get.yml

@@ -30,13 +30,14 @@ setup:
           persistent:
             logger.org.elasticsearch.synonyms: DEBUG
 
-  # This is to ensure that all index shards (write and read) are available. In serverless this can take some time.
+  # This is to ensure that at least two index shards (write and read) are available. In serverless this can take some time.
   - do:
       cluster.health:
         index: .synonyms-2
         level: shards
+        wait_for_active_shards: 2
         timeout: 1m
-        wait_for_status: green
+        wait_for_status: yellow
 
 
 ---

rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/synonyms/50_synonym_rule_put.yml

@@ -14,13 +14,14 @@ setup:
             - synonyms: "test => check"
               id: "test-id-3"
 
-  # This is to ensure that all index shards (write and read) are available. In serverless this can take some time.
+  # This is to ensure that at least two index shards (write and read) are available. In serverless this can take some time.
   - do:
       cluster.health:
         index: .synonyms-2
         level: shards
+        wait_for_active_shards: 2
         timeout: 1m
-        wait_for_status: green
+        wait_for_status: yellow
 
 ---
 "Update a synonyms rule":

rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/synonyms/60_synonym_rule_get.yml

@@ -14,13 +14,14 @@ setup:
             - synonyms: "test => check"
               id: "test-id-3"
 
-  # This is to ensure that all index shards (write and read) are available. In serverless this can take some time.
+  # This is to ensure that at least two index shards (write and read) are available. In serverless this can take some time.
   - do:
       cluster.health:
         index: .synonyms-2
         level: shards
-        timeout: 1m
-        wait_for_status: green
+        wait_for_active_shards: 2
+        timeout: 20s
+        wait_for_status: yellow
 
 ---
 "Get a synonym rule":

rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/synonyms/70_synonym_rule_delete.yml

@@ -14,13 +14,14 @@ setup:
             - synonyms: "test => check"
               id: "test-id-3"
 
-  # This is to ensure that all index shards (write and read) are available. In serverless this can take some time.
+  # This is to ensure that at least two index shards (write and read) are available. In serverless this can take some time.
   - do:
       cluster.health:
         index: .synonyms-2
         level: shards
+        wait_for_active_shards: 2
         timeout: 1m
-        wait_for_status: green
+        wait_for_status: yellow
 
 
 ---

rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/synonyms/80_synonyms_from_index.yml

@@ -14,13 +14,14 @@ setup:
             - synonyms: "bye => goodbye"
               id: "synonym-rule-2"
 
-  # This is to ensure that all index shards (write and read) are available. In serverless this can take some time.
+  # This is to ensure that at least two index shards (write and read) are available. In serverless this can take some time.
   - do:
       cluster.health:
         index: .synonyms-2
         level: shards
+        wait_for_active_shards: 2
         timeout: 1m
-        wait_for_status: green
+        wait_for_status: yellow
 
   # Create an index with synonym_filter that uses that synonyms set
   - do:

rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/synonyms/90_synonyms_reloading_for_synset.yml

@@ -26,13 +26,14 @@
             - synonyms: "bye => goodbye"
               id: "synonym-rule-2"
 
-  # This is to ensure that all index shards (write and read) are available. In serverless this can take some time.
+  # This is to ensure that at least two index shards (write and read) are available. In serverless this can take some time.
   - do:
       cluster.health:
         index: .synonyms-2
         level: shards
+        wait_for_active_shards: 2
         timeout: 1m
-        wait_for_status: green
+        wait_for_status: yellow
 
   # Create my_index1 with synonym_filter that uses synonyms_set1
   - do: