Merge branch 'servicenow-recover-action' of https://github.com/js-jan…

…kisalvi/kibana into servicenow-recover-action
elastic · Nov 30, 2023 · c6b81fa · c6b81fa
2 parents d163bc1 + c8ff4fe
commit c6b81fa
Show file tree

Hide file tree

Showing 1,253 changed files with 18,181 additions and 8,153 deletions.
diff --git a/.buildkite/pipelines/artifacts.yml b/.buildkite/pipelines/artifacts.yml
@@ -61,7 +61,7 @@ steps:
         - exit_status: '*'
           limit: 1
 
-  - command: KIBANA_DOCKER_CONTEXT=ubi9 .buildkite/scripts/steps/artifacts/docker_context.sh
+  - command: KIBANA_DOCKER_CONTEXT=ubi .buildkite/scripts/steps/artifacts/docker_context.sh
     label: 'Docker Context Verification'
     agents:
       queue: n2-2

diff --git a/.buildkite/pipelines/es_serverless/verify_es_serverless_image.yml b/.buildkite/pipelines/es_serverless/verify_es_serverless_image.yml
@@ -56,7 +56,12 @@ steps:
             - exit_status: '*'
               limit: 1
 
-      - command: .buildkite/scripts/steps/functional/security_serverless.sh
+      - 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"
         label: 'Serverless Security Cypress Tests'
         if: "build.env('SKIP_CYPRESS') != '1' && build.env('SKIP_CYPRESS') != 'true'"
         agents:
@@ -69,7 +74,12 @@ steps:
             - exit_status: '*'
               limit: 1
 
-      - command: .buildkite/scripts/steps/functional/security_serverless_explore.sh
+      - 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"
         label: 'Serverless Explore - Security Solution Cypress Tests'
         if: "build.env('SKIP_CYPRESS') != '1' && build.env('SKIP_CYPRESS') != 'true'"
         agents:
@@ -82,7 +92,12 @@ steps:
             - exit_status: '*'
               limit: 1
 
-      - command: .buildkite/scripts/steps/functional/security_serverless_investigations.sh
+      - 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"
         label: 'Serverless Investigations - Security Solution Cypress Tests'
         if: "build.env('SKIP_CYPRESS') != '1' && build.env('SKIP_CYPRESS') != 'true'"
         agents:
@@ -95,7 +110,12 @@ steps:
             - exit_status: '*'
               limit: 1
 
-      - command: .buildkite/scripts/steps/functional/security_serverless_rule_management.sh
+      - 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"
         label: 'Serverless Rule Management - Security Solution Cypress Tests'
         if: "build.env('SKIP_CYPRESS') != '1' && build.env('SKIP_CYPRESS') != 'true'"
         agents:
@@ -108,7 +128,12 @@ steps:
             - exit_status: '*'
               limit: 1
 
-      - command: .buildkite/scripts/steps/functional/security_serverless_rule_management_prebuilt_rules.sh
+      - 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"
         label: 'Serverless Rule Management - Prebuilt Rules - Security Solution Cypress Tests'
         if: "build.env('SKIP_CYPRESS') != '1' && build.env('SKIP_CYPRESS') != 'true'"
         agents:
@@ -121,7 +146,12 @@ steps:
             - exit_status: '*'
               limit: 1
 
-      - command: .buildkite/scripts/steps/functional/defend_workflows_serverless.sh
+      - 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"
         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,7 +79,12 @@ steps:
         - exit_status: '*'
           limit: 1
 
-  - command: .buildkite/scripts/steps/functional/security_serverless.sh
+  - 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"
     label: 'Serverless Security Cypress Tests'
     agents:
       queue: n2-4-spot
@@ -91,8 +96,13 @@ steps:
         - exit_status: '*'
           limit: 1
 
-  - command: .buildkite/scripts/steps/functional/security_serverless_explore.sh
-    label: 'Serverless Explore - Security Solution Cypress Tests'
+  - 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'
     agents:
       queue: n2-4-spot
     depends_on: build
@@ -103,8 +113,13 @@ steps:
         - exit_status: '*'
           limit: 1
 
-  - command: .buildkite/scripts/steps/functional/security_serverless_investigations.sh
-    label: 'Serverless Investigations - Security Solution Cypress Tests'
+  - 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'
     agents:
       queue: n2-4-spot
     depends_on: build
@@ -115,8 +130,13 @@ steps:
         - exit_status: '*'
           limit: 1
 
-  - command: .buildkite/scripts/steps/functional/security_serverless_rule_management.sh
-    label: 'Serverless Rule Management - Security Solution Cypress Tests'
+  - 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'
     agents:
       queue: n2-4-spot
     depends_on: build
@@ -127,8 +147,13 @@ steps:
         - exit_status: '*'
           limit: 1
 
-  - command: .buildkite/scripts/steps/functional/security_serverless_rule_management_prebuilt_rules.sh
-    label: 'Serverless Rule Management - Prebuilt Rules - Security Solution Cypress Tests'
+  - 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'
     agents:
       queue: n2-4-spot
     depends_on: build
@@ -139,7 +164,12 @@ steps:
         - exit_status: '*'
           limit: 1
 
-  - command: .buildkite/scripts/steps/functional/security_solution_rule_management.sh
+  - 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"
     label: 'Rule Management - Security Solution Cypress Tests'
     agents:
       queue: n2-4-spot
@@ -151,7 +181,12 @@ steps:
         - exit_status: '*'
           limit: 1
 
-  - command: .buildkite/scripts/steps/functional/security_solution_rule_management_prebuilt_rules.sh
+  - 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"
     label: 'Rule Management - Prebuilt Rules - Security Solution Cypress Tests'
     agents:
       queue: n2-4-spot
@@ -163,7 +198,12 @@ steps:
         - exit_status: '*'
           limit: 1
 
-  - command: .buildkite/scripts/steps/functional/security_solution.sh
+  - 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)"
     label: 'Security Solution Cypress Tests'
     agents:
       queue: n2-4-spot
@@ -175,7 +215,12 @@ steps:
         - exit_status: '*'
           limit: 1
 
-  - command: .buildkite/scripts/steps/functional/security_solution_explore.sh
+  - 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"
     label: 'Explore - Security Solution Cypress Tests'
     agents:
       queue: n2-4-spot
@@ -187,7 +232,12 @@ steps:
         - exit_status: '*'
           limit: 1
 
-  - command: .buildkite/scripts/steps/functional/security_solution_investigations.sh
+  - 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"
     label: 'Investigations - Security Solution Cypress Tests'
     agents:
       queue: n2-4-spot
@@ -199,7 +249,12 @@ steps:
         - exit_status: '*'
           limit: 1
 
-  - command: .buildkite/scripts/steps/functional/defend_workflows.sh
+  - 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"
     label: 'Defend Workflows Cypress Tests'
     agents:
       queue: n2-4-virt
@@ -211,7 +266,12 @@ steps:
         - exit_status: '*'
           limit: 1
 
-  - command: .buildkite/scripts/steps/functional/defend_workflows_serverless.sh
+  - 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"
     label: 'Defend Workflows Cypress Tests on Serverless'
     agents:
       queue: n2-4-virt
@@ -223,7 +283,12 @@ steps:
         - exit_status: '*'
           limit: 1
 
-  - command: .buildkite/scripts/steps/functional/threat_intelligence.sh
+  - 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)"
     label: 'Threat Intelligence Cypress Tests'
     agents:
       queue: n2-4-spot