Fixed exit codes and retries

elastic · Nov 23, 2023 · e1f7f38 · e1f7f38
1 parent 00f5d8e
commit e1f7f38
Show file tree

Hide file tree

Showing 3 changed files with 35 additions and 71 deletions.
diff --git a/.buildkite/pipelines/security_solution/api_integration.yml b/.buildkite/pipelines/security_solution/api_integration.yml
@@ -19,13 +19,11 @@ steps:
     timeout_in_minutes: 300
     retry:
       automatic:
-        - exit_status: "*"
-          limit: 1
         - exit_status: "-1"
           limit: 2
 
   - label: Running exception_workflows:qa:serverless
-    command: .buildkite/scripts/pipelines/security_solution_quality_gate/api-integration-tests.sh exception_workflows:qa:serverless
+    command: .buildkite/scripts/pipelines/security_solution_quality_gate/api_integration/api-integration-tests.sh exception_workflows:qa:serverless
     key: exception_workflows:qa:serverless
     depends_on: build_image
     agents:
@@ -35,11 +33,9 @@ steps:
       automatic:
         - exit_status: "*"
           limit: 2
-        - exit_status: "-1"
-          limit: 2
 
   - label: Running exception_operators_date_numeric_types:qa:serverless
-    command: .buildkite/scripts/pipelines/security_solution_quality_gate/api-integration-tests.sh exception_operators_date_numeric_types:qa:serverless
+    command: .buildkite/scripts/pipelines/security_solution_quality_gate/api_integration/api-integration-tests.sh exception_operators_date_numeric_types:qa:serverless
     key: exception_operators_date_numeric_types:qa:serverless
     depends_on: build_image
     agents:
@@ -49,11 +45,9 @@ steps:
       automatic:
         - exit_status: "*"
           limit: 2
-        - exit_status: "-1"
-          limit: 2
 
   - label: Running exception_operators_keyword:qa:serverless
-    command: .buildkite/scripts/pipelines/security_solution_quality_gate/api-integration-tests.sh exception_operators_keyword:qa:serverless
+    command: .buildkite/scripts/pipelines/security_solution_quality_gate/api_integration/api-integration-tests.sh exception_operators_keyword:qa:serverless
     key: exception_operators_keyword:qa:serverless
     depends_on: build_image
     agents:
@@ -63,11 +57,9 @@ steps:
       automatic:
         - exit_status: "*"
           limit: 2
-        - exit_status: "-1"
-          limit: 2
 
   - label: Running exception_operators_ips:qa:serverless
-    command: .buildkite/scripts/pipelines/security_solution_quality_gate/api-integration-tests.sh exception_operators_ips:qa:serverless
+    command: .buildkite/scripts/pipelines/security_solution_quality_gate/api_integration/api-integration-tests.sh exception_operators_ips:qa:serverless
     depends_on: build_image
     key: exception_operators_ips:qa:serverless
     agents:
@@ -77,173 +69,147 @@ steps:
       automatic:
         - exit_status: "*"
           limit: 2
-        - exit_status: "-1"
-          limit: 2
 
   - label: Running exception_operators_long:qa:serverless
-    command: .buildkite/scripts/pipelines/security_solution_quality_gate/api-integration-tests.sh exception_operators_long:qa:serverless
+    command: .buildkite/scripts/pipelines/security_solution_quality_gate/api_integration/api-integration-tests.sh exception_operators_long:qa:serverless
     depends_on: build_image
     key: exception_operators_long:qa:serverless
     agents:
       queue: n2-4-spot
     timeout_in_minutes: 120
     retry:
       automatic:
-        - exit_status: "1"
-          limit: 2
-        - exit_status: "-1"
+        - exit_status: "*"
           limit: 2
 
   - label: Running exception_operators_text:qa:serverless
-    command: .buildkite/scripts/pipelines/security_solution_quality_gate/api-integration-tests.sh exception_operators_text:qa:serverless
+    command: .buildkite/scripts/pipelines/security_solution_quality_gate/api_integration/api-integration-tests.sh exception_operators_text:qa:serverless
     depends_on: build_image
     key: exception_operators_text:qa:serverless
     agents:
       queue: n2-4-spot
     timeout_in_minutes: 120
     retry:
       automatic:
-        - exit_status: "1"
-          limit: 2
-        - exit_status: "-1"
+        - exit_status: "*"
           limit: 2
 
   - label: Running rule_creation:qa:serverless
-    command: .buildkite/scripts/pipelines/security_solution_quality_gate/api-integration-tests.sh rule_creation:qa:serverless
+    command: .buildkite/scripts/pipelines/security_solution_quality_gate/api_integration/api-integration-tests.sh rule_creation:qa:serverless
     depends_on: build_image
     key: rule_creation:qa:serverless
     agents:
       queue: n2-4-spot
     timeout_in_minutes: 120
     retry:
       automatic:
-        - exit_status: "1"
-          limit: 2
-        - exit_status: "-1"
+        - exit_status: "*"
           limit: 2
 
   - label: Running actions:qa:serverless
-    command: .buildkite/scripts/pipelines/security_solution_quality_gate/api-integration-tests.sh actions:qa:serverless
+    command: .buildkite/scripts/pipelines/security_solution_quality_gate/api_integration/api-integration-tests.sh actions:qa:serverless
     depends_on: build_image
     key: actions:qa:serverless
     agents:
       queue: n2-4-spot
     timeout_in_minutes: 120
     retry:
       automatic:
-        - exit_status: "1"
-          limit: 2
-        - exit_status: "-1"
+        - exit_status: "*"
           limit: 2
 
   - label: Running entity_analytics:qa:serverless
-    command: .buildkite/scripts/pipelines/security_solution_quality_gate/api-integration-tests.sh entity_analytics:qa:serverless
+    command: .buildkite/scripts/pipelines/security_solution_quality_gate/api_integration/api-integration-tests.sh entity_analytics:qa:serverless
     depends_on: build_image
     key: entity_analytics:qa:serverless
     agents:
       queue: n2-4-spot
     timeout_in_minutes: 120
     retry:
       automatic:
-        - exit_status: "1"
-          limit: 2
-        - exit_status: "-1"
+        - exit_status: "*"
           limit: 2
 
   - label: Running prebuilt_rules_management:qa:serverless
-    command: .buildkite/scripts/pipelines/security_solution_quality_gate/api-integration-tests.sh prebuilt_rules_management:qa:serverless
+    command: .buildkite/scripts/pipelines/security_solution_quality_gate/api_integration/api-integration-tests.sh prebuilt_rules_management:qa:serverless
     depends_on: build_image
     key: prebuilt_rules_management:qa:serverless
     agents:
       queue: n2-4-spot
     timeout_in_minutes: 120
     retry:
       automatic:
-        - exit_status: "1"
-          limit: 2
-        - exit_status: "-1"
+        - exit_status: "*"
           limit: 2
 
   - label: Running prebuilt_rules_bundled_prebuilt_rules_package:qa:serverless
-    command: .buildkite/scripts/pipelines/security_solution_quality_gate/api-integration-tests.sh prebuilt_rules_bundled_prebuilt_rules_package:qa:serverless
+    command: .buildkite/scripts/pipelines/security_solution_quality_gate/api_integration/api-integration-tests.sh prebuilt_rules_bundled_prebuilt_rules_package:qa:serverless
     depends_on: build_image
     key: prebuilt_rules_bundled_prebuilt_rules_package:qa:serverless
     agents:
       queue: n2-4-spot
     timeout_in_minutes: 120
     retry:
       automatic:
-        - exit_status: "1"
-          limit: 2
-        - exit_status: "-1"
+        - exit_status: "*"
           limit: 2
 
   - label: Running prebuilt_rules_large_prebuilt_rules_package:qa:serverless
-    command: .buildkite/scripts/pipelines/security_solution_quality_gate/api-integration-tests.sh prebuilt_rules_large_prebuilt_rules_package:qa:serverless
+    command: .buildkite/scripts/pipelines/security_solution_quality_gate/api_integration/api-integration-tests.sh prebuilt_rules_large_prebuilt_rules_package:qa:serverless
     depends_on: build_image
     key: prebuilt_rules_large_prebuilt_rules_package:qa:serverless
     agents:
       queue: n2-4-spot
     timeout_in_minutes: 120
     retry:
       automatic:
-        - exit_status: "1"
-          limit: 2
-        - exit_status: "-1"
+        - exit_status: "*"
           limit: 2
 
   - label: Running prebuilt_rules_update_prebuilt_rules_package:qa:serverless
-    command: .buildkite/scripts/pipelines/security_solution_quality_gate/api-integration-tests.sh prebuilt_rules_update_prebuilt_rules_package:qa:serverless
+    command: .buildkite/scripts/pipelines/security_solution_quality_gate/api_integration/api-integration-tests.sh prebuilt_rules_update_prebuilt_rules_package:qa:serverless
     depends_on: build_image
     key: prebuilt_rules_update_prebuilt_rules_package:qa:serverless
     agents:
       queue: n2-4-spot
     timeout_in_minutes: 120
     retry:
       automatic:
-        - exit_status: "1"
-          limit: 2
-        - exit_status: "-1"
+        - exit_status: "*"
           limit: 2
 
   - label: Running rule_execution_logic:qa:serverless
-    command: .buildkite/scripts/pipelines/security_solution_quality_gate/api-integration-tests.sh rule_execution_logic:qa:serverless
+    command: .buildkite/scripts/pipelines/security_solution_quality_gate/api_integration/api-integration-tests.sh rule_execution_logic:qa:serverless
     depends_on: build_image
     key: rule_execution_logic:qa:serverless
     agents:
       queue: n2-4-spot
     timeout_in_minutes: 120
     retry:
       automatic:
-        - exit_status: "1"
-          limit: 2
-        - exit_status: "-1"
+        - exit_status: "*"
           limit: 2
 
   - label: Running user_roles:qa:serverless
-    command: .buildkite/scripts/pipelines/security_solution_quality_gate/api-integration-tests.sh user_roles:qa:serverless
+    command: .buildkite/scripts/pipelines/security_solution_quality_gate/api_integration/api-integration-tests.sh user_roles:qa:serverless
     depends_on: build_image
     key: user_roles:qa:serverless
     agents:
       queue: n2-4-spot
     timeout_in_minutes: 120
     retry:
       automatic:
-        - exit_status: "1"
-          limit: 2
-        - exit_status: "-1"
+        - exit_status: "*"
           limit: 2
 
   - label: Running telemetry:qa:serverless
-    command: .buildkite/scripts/pipelines/security_solution_quality_gate/api-integration-tests.sh telemetry:qa:serverless
+    command: .buildkite/scripts/pipelines/security_solution_quality_gate/api_integration/api-integration-tests.sh telemetry:qa:serverless
     depends_on: build_image
     key: telemetry:qa:serverless
     agents:
       queue: n2-4-spot
     timeout_in_minutes: 120
     retry:
       automatic:
-        - exit_status: "1"
-          limit: 2
-        - exit_status: "-1"
+        - exit_status: "*"
           limit: 2
diff --git a/.buildkite/pipelines/security_solution/security_solution_cypress.yml b/.buildkite/pipelines/security_solution/security_solution_cypress.yml
@@ -21,11 +21,9 @@ steps:
       automatic:
         - exit_status: "*"
           limit: 1
-        - exit_status: "-1"
-          limit: 2
 
   - command: .buildkite/scripts/pipelines/security_solution_quality_gate/security_solution_cypress/mki_security_solution_cypress.sh cypress:run:qa:serverless
-    label: 'Serverless MKI QA Security Cypress Tests'
+    label: "Serverless MKI QA Security Cypress Tests"
     depends_on: build_image
     agents:
       queue: n2-4-spot
@@ -34,11 +32,11 @@ steps:
     parallelism: 6
     retry:
       automatic:
-        - exit_status: '*'
+        - exit_status: "*"
           limit: 1
 
   - command: .buildkite/scripts/pipelines/security_solution_quality_gate/security_solution_cypress/mki_security_solution_cypress.sh cypress:run:qa:serverless:explore
-    label: 'Serverless MKI QA Explore - Security Solution Cypress Tests'
+    label: "Serverless MKI QA Explore - Security Solution Cypress Tests"
     depends_on: build_image
     agents:
       queue: n2-4-spot
@@ -47,11 +45,11 @@ steps:
     parallelism: 4
     retry:
       automatic:
-        - exit_status: '*'
+        - exit_status: "*"
           limit: 1
 
   - command: .buildkite/scripts/pipelines/security_solution_quality_gate/security_solution_cypress/mki_security_solution_cypress.sh cypress:run:qa:serverless:investigations
-    label: 'Serverless MKI QA Investigations - Security Solution Cypress Tests'
+    label: "Serverless MKI QA Investigations - Security Solution Cypress Tests"
     depends_on: build_image
     agents:
       queue: n2-4-spot
@@ -60,5 +58,5 @@ steps:
     parallelism: 8
     retry:
       automatic:
-        - exit_status: '*'
-          limit: 1
+        - exit_status: "*"
+          limit: 1
diff --git a/...ion_quality_gate/api-integration-tests.sh → .../api_integration/api-integration-tests.sh b/...ion_quality_gate/api-integration-tests.sh → .../api_integration/api-integration-tests.sh