Merge branch 'main' into servicenow-recover-action

elastic · Dec 1, 2023 · 7fc2b4e · 7fc2b4e
2 parents 7088a16 + a9465c7
commit 7fc2b4e
Show file tree

Hide file tree

Showing 744 changed files with 5,382 additions and 2,705 deletions.
diff --git a/.buildkite/pipelines/es_serverless/verify_es_serverless_image.yml b/.buildkite/pipelines/es_serverless/verify_es_serverless_image.yml
@@ -56,12 +56,7 @@ steps:
             - exit_status: '*'
               limit: 1
 
-      - command: .buildkite/scripts/steps/functional/security_cypress_exec.sh 
-        env:
-          TARGET: cypress:run:serverless
-          ROOT_DIR: x-pack/test/security_solution_cypress
-          JOB_TITLE: kibana-serverless-security-cypress
-          MSG: "--- Security Serverless Cypress Tests"
+      - command: .buildkite/scripts/steps/functional/security_serverless.sh
         label: 'Serverless Security Cypress Tests'
         if: "build.env('SKIP_CYPRESS') != '1' && build.env('SKIP_CYPRESS') != 'true'"
         agents:
@@ -74,12 +69,7 @@ steps:
             - exit_status: '*'
               limit: 1
 
-      - command: .buildkite/scripts/steps/functional/security_cypress_exec.sh
-        env:
-          TARGET: cypress:explore:run:serverless
-          ROOT_DIR: x-pack/test/security_solution_cypress
-          JOB_TITLE: kibana-security-solution-chrome
-          MSG: "--- Explore - Security Solution Cypress Tests"
+      - command: .buildkite/scripts/steps/functional/security_serverless_explore.sh
         label: 'Serverless Explore - Security Solution Cypress Tests'
         if: "build.env('SKIP_CYPRESS') != '1' && build.env('SKIP_CYPRESS') != 'true'"
         agents:
@@ -92,12 +82,7 @@ steps:
             - exit_status: '*'
               limit: 1
 
-      - command: .buildkite/scripts/steps/functional/security_cypress_exec.sh
-        env:
-          TARGET: cypress:investigations:run:serverless
-          ROOT_DIR: x-pack/test/security_solution_cypress
-          JOB_TITLE: kibana-security-solution-chrome
-          MSG: "--- Investigations Cypress Tests on Serverless"
+      - command: .buildkite/scripts/steps/functional/security_serverless_investigations.sh
         label: 'Serverless Investigations - Security Solution Cypress Tests'
         if: "build.env('SKIP_CYPRESS') != '1' && build.env('SKIP_CYPRESS') != 'true'"
         agents:
@@ -110,12 +95,7 @@ steps:
             - exit_status: '*'
               limit: 1
 
-      - command: .buildkite/scripts/steps/functional/security_cypress_exec.sh
-        env:
-          TARGET: cypress:rule_management:run:serverless
-          ROOT_DIR: x-pack/test/security_solution_cypress
-          JOB_TITLE: kibana-security-solution-chrome
-          MSG: "--- Rule Management Cypress Tests on Serverless"
+      - command: .buildkite/scripts/steps/functional/security_serverless_rule_management.sh
         label: 'Serverless Rule Management - Security Solution Cypress Tests'
         if: "build.env('SKIP_CYPRESS') != '1' && build.env('SKIP_CYPRESS') != 'true'"
         agents:
@@ -128,12 +108,7 @@ steps:
             - exit_status: '*'
               limit: 1
 
-      - command: .buildkite/scripts/steps/functional/security_cypress_exec.sh
-        env:
-          TARGET: cypress:rule_management:prebuilt_rules:run:serverless
-          ROOT_DIR: x-pack/test/security_solution_cypress
-          JOB_TITLE: kibana-security-solution-chrome
-          MSG: "--- Rule Management - Prebuilt Rules - Cypress Tests on Serverless"
+      - command: .buildkite/scripts/steps/functional/security_serverless_rule_management_prebuilt_rules.sh
         label: 'Serverless Rule Management - Prebuilt Rules - Security Solution Cypress Tests'
         if: "build.env('SKIP_CYPRESS') != '1' && build.env('SKIP_CYPRESS') != 'true'"
         agents:
@@ -146,12 +121,7 @@ steps:
             - exit_status: '*'
               limit: 1
 
-      - command: .buildkite/scripts/steps/functional/security_cypress_exec.sh
-        env:
-          TARGET: cypress:dw:serverless:run
-          ROOT_DIR: x-pack/plugins/security_solution
-          JOB_TITLE: kibana-defend-workflows-serverless-cypress
-          MSG: "--- Defend Workflows Cypress tests on Serverless"
+      - command: .buildkite/scripts/steps/functional/defend_workflows_serverless.sh
         label: 'Defend Workflows Cypress Tests on Serverless'
         if: "build.env('SKIP_CYPRESS') != '1' && build.env('SKIP_CYPRESS') != 'true'"
         agents:

diff --git a/.buildkite/pipelines/on_merge.yml b/.buildkite/pipelines/on_merge.yml
@@ -79,12 +79,7 @@ steps:
         - exit_status: '*'
           limit: 1
 
-  - command: .buildkite/scripts/steps/functional/security_cypress_exec.sh 
-    env:
-      TARGET: cypress:run:serverless
-      ROOT_DIR: x-pack/test/security_solution_cypress
-      JOB_TITLE: kibana-serverless-security-cypress
-      MSG: "--- Security Serverless Cypress Tests"
+  - command: .buildkite/scripts/steps/functional/security_serverless.sh
     label: 'Serverless Security Cypress Tests'
     agents:
       queue: n2-4-spot
@@ -96,13 +91,8 @@ steps:
         - exit_status: '*'
           limit: 1
 
-  - command: .buildkite/scripts/steps/functional/security_cypress_exec.sh
-    env:
-      TARGET: cypress:explore:run:serverless
-      ROOT_DIR: x-pack/test/security_solution_cypress
-      JOB_TITLE: kibana-security-solution-chrome
-      MSG: "--- Serverless Explore - Security Cypress Tests"
-    label: 'Serverless Explore - Security Cypress Tests'
+  - command: .buildkite/scripts/steps/functional/security_serverless_explore.sh
+    label: 'Serverless Explore - Security Solution Cypress Tests'
     agents:
       queue: n2-4-spot
     depends_on: build
@@ -113,13 +103,8 @@ steps:
         - exit_status: '*'
           limit: 1
 
-  - command: .buildkite/scripts/steps/functional/security_cypress_exec.sh
-    env:
-      TARGET: cypress:investigations:run:serverless
-      ROOT_DIR: x-pack/test/security_solution_cypress
-      JOB_TITLE: kibana-security-solution-chrome
-      MSG: "--- Serverless Investigations - Security Cypress Tests"    
-    label: 'Serverless Investigations - Security Cypress Tests'
+  - command: .buildkite/scripts/steps/functional/security_serverless_investigations.sh
+    label: 'Serverless Investigations - Security Solution Cypress Tests'
     agents:
       queue: n2-4-spot
     depends_on: build
@@ -130,13 +115,8 @@ steps:
         - exit_status: '*'
           limit: 1
 
-  - command: .buildkite/scripts/steps/functional/security_cypress_exec.sh
-    env:
-      TARGET: cypress:rule_management:run:serverless
-      ROOT_DIR: x-pack/test/security_solution_cypress
-      JOB_TITLE: kibana-security-solution-chrome
-      MSG: "--- Serverless Rule Management - Security Cypress Tests "
-    label: 'Serverless Rule Management - Security Cypress Tests'
+  - command: .buildkite/scripts/steps/functional/security_serverless_rule_management.sh
+    label: 'Serverless Rule Management - Security Solution Cypress Tests'
     agents:
       queue: n2-4-spot
     depends_on: build
@@ -147,13 +127,8 @@ steps:
         - exit_status: '*'
           limit: 1
 
-  - command: .buildkite/scripts/steps/functional/security_cypress_exec.sh
-    env:
-      TARGET: cypress:rule_management:prebuilt_rules:run:serverless
-      ROOT_DIR: x-pack/test/security_solution_cypress
-      JOB_TITLE: kibana-security-solution-chrome
-      MSG: "--- Rule Management - Prebuilt Rules - Security Cypress Tests"
-    label: 'Rule Management - Prebuilt Rules - Security Cypress Tests'
+  - command: .buildkite/scripts/steps/functional/security_serverless_rule_management_prebuilt_rules.sh
+    label: 'Serverless Rule Management - Prebuilt Rules - Security Solution Cypress Tests'
     agents:
       queue: n2-4-spot
     depends_on: build
@@ -164,12 +139,7 @@ steps:
         - exit_status: '*'
           limit: 1
 
-  - command: .buildkite/scripts/steps/functional/security_cypress_exec.sh
-    env:
-      TARGET: cypress:rule_management:run:ess
-      ROOT_DIR: x-pack/test/security_solution_cypress
-      JOB_TITLE: kibana-security-solution-chrome
-      MSG: "--- Rule Management - Security Solution Cypress Tests"
+  - command: .buildkite/scripts/steps/functional/security_solution_rule_management.sh
     label: 'Rule Management - Security Solution Cypress Tests'
     agents:
       queue: n2-4-spot
@@ -181,12 +151,7 @@ steps:
         - exit_status: '*'
           limit: 1
 
-  - command: .buildkite/scripts/steps/functional/security_cypress_exec.sh
-    env:
-      TARGET: cypress:rule_management:prebuilt_rules:run:ess
-      ROOT_DIR: x-pack/test/security_solution_cypress
-      JOB_TITLE: kibana-security-solution-chrome
-      MSG: "--- Rule Management - Prebuilt Rules - Security Solution Cypress Tests"
+  - command: .buildkite/scripts/steps/functional/security_solution_rule_management_prebuilt_rules.sh
     label: 'Rule Management - Prebuilt Rules - Security Solution Cypress Tests'
     agents:
       queue: n2-4-spot
@@ -198,12 +163,7 @@ steps:
         - exit_status: '*'
           limit: 1
 
-  - command: .buildkite/scripts/steps/functional/security_cypress_exec.sh
-    env:
-      TARGET: cypress:run:ess
-      ROOT_DIR: x-pack/test/security_solution_cypress
-      JOB_TITLE: kibana-security-solution-chrome
-      MSG: "--- Security Solution Cypress tests (Chrome)"
+  - command: .buildkite/scripts/steps/functional/security_solution.sh
     label: 'Security Solution Cypress Tests'
     agents:
       queue: n2-4-spot
@@ -215,12 +175,7 @@ steps:
         - exit_status: '*'
           limit: 1
 
-  - command: .buildkite/scripts/steps/functional/security_cypress_exec.sh
-    env:
-      TARGET: cypress:explore:run:ess
-      ROOT_DIR: x-pack/test/security_solution_cypress
-      JOB_TITLE: kibana-security-solution-chrome
-      MSG: "--- Explore Cypress Tests on Security Solution"
+  - command: .buildkite/scripts/steps/functional/security_solution_explore.sh
     label: 'Explore - Security Solution Cypress Tests'
     agents:
       queue: n2-4-spot
@@ -232,12 +187,7 @@ steps:
         - exit_status: '*'
           limit: 1
 
-  - command: .buildkite/scripts/steps/functional/security_cypress_exec.sh
-    env:
-      TARGET: cypress:investigations:run:ess
-      ROOT_DIR: x-pack/test/security_solution_cypress
-      JOB_TITLE: kibana-security-solution-chrome
-      MSG: "--- Investigations - Security Solution Cypress Tests"
+  - command: .buildkite/scripts/steps/functional/security_solution_investigations.sh
     label: 'Investigations - Security Solution Cypress Tests'
     agents:
       queue: n2-4-spot
@@ -249,12 +199,7 @@ steps:
         - exit_status: '*'
           limit: 1
 
-  - command: .buildkite/scripts/steps/functional/security_cypress_exec.sh
-    env:
-      TARGET: cypress:dw:run
-      ROOT_DIR: x-pack/plugins/security_solution
-      JOB_TITLE: kibana-defend-workflows-cypress
-      MSG: "--- Defend Workflows Cypress tests"
+  - command: .buildkite/scripts/steps/functional/defend_workflows.sh
     label: 'Defend Workflows Cypress Tests'
     agents:
       queue: n2-4-virt
@@ -266,12 +211,7 @@ steps:
         - exit_status: '*'
           limit: 1
 
-  - command: .buildkite/scripts/steps/functional/security_cypress_exec.sh
-    env:
-      TARGET: cypress:dw:serverless:run
-      ROOT_DIR: x-pack/plugins/security_solution
-      JOB_TITLE: kibana-defend-workflows-serverless-cypress
-      MSG: "--- Defend Workflows Cypress tests on Serverless"
+  - command: .buildkite/scripts/steps/functional/defend_workflows_serverless.sh
     label: 'Defend Workflows Cypress Tests on Serverless'
     agents:
       queue: n2-4-virt
@@ -283,12 +223,7 @@ steps:
         - exit_status: '*'
           limit: 1
 
-  - command: .buildkite/scripts/steps/functional/security_cypress_exec.sh
-    env:
-      TARGET: cypress:run
-      ROOT_DIR: x-pack/plugins/threat_intelligence
-      JOB_TITLE: kibana-threat-intelligence-chrome
-      MSG: "--- Threat Intelligence Cypress tests (Chrome)"
+  - command: .buildkite/scripts/steps/functional/threat_intelligence.sh
     label: 'Threat Intelligence Cypress Tests'
     agents:
       queue: n2-4-spot