Merge branch 'navigation-embeddable' into navEmbeddable-external-icon

.buildkite/ftr_configs.yml

@@ -28,6 +28,7 @@ disabled:
   - x-pack/test/defend_workflows_cypress/cli_config.ts
   - x-pack/test/defend_workflows_cypress/config.ts
   - x-pack/test/defend_workflows_cypress/endpoint_config.ts
+  - x-pack/test/defend_workflows_cypress/endpoint_serverless_config.ts
   - x-pack/plugins/observability_onboarding/e2e/ftr_config_open.ts
   - x-pack/plugins/observability_onboarding/e2e/ftr_config_runner.ts
   - x-pack/plugins/observability_onboarding/e2e/ftr_config.ts
@@ -79,24 +80,12 @@ disabled:
   - x-pack/test_serverless/functional/config.base.ts
   - x-pack/test_serverless/shared/config.base.ts
 
-  # Serverless configs, currently only for manual tests runs, CI integration planned
-  - x-pack/test_serverless/api_integration/test_suites/common/config.ts
-  - x-pack/test_serverless/api_integration/test_suites/observability/config.ts
-  - x-pack/test_serverless/api_integration/test_suites/observability/config.feature_flags.ts
-  - x-pack/test_serverless/api_integration/test_suites/search/config.ts
-  - x-pack/test_serverless/api_integration/test_suites/search/config.feature_flags.ts
-  - x-pack/test_serverless/api_integration/test_suites/security/config.ts
-  - x-pack/test_serverless/api_integration/test_suites/security/config.feature_flags.ts
-  - x-pack/test_serverless/functional/test_suites/common/config.ts
-  - x-pack/test_serverless/functional/test_suites/observability/config.ts
+  # Serverless feature flag config files (move to enabled after tests are added)
   - x-pack/test_serverless/functional/test_suites/observability/config.feature_flags.ts
-  - x-pack/test_serverless/functional/test_suites/observability/config.examples.ts
-  - x-pack/test_serverless/functional/test_suites/search/config.ts
+  - x-pack/test_serverless/api_integration/test_suites/search/config.feature_flags.ts
   - x-pack/test_serverless/functional/test_suites/search/config.feature_flags.ts
-  - x-pack/test_serverless/functional/test_suites/search/config.examples.ts
-  - x-pack/test_serverless/functional/test_suites/security/config.ts
+  - x-pack/test_serverless/api_integration/test_suites/security/config.feature_flags.ts
   - x-pack/test_serverless/functional/test_suites/security/config.feature_flags.ts
-  - x-pack/test_serverless/functional/test_suites/security/config.examples.ts
 
 defaultQueue: 'n2-4-spot'
 enabled:
@@ -171,6 +160,7 @@ enabled:
   - x-pack/test/alerting_api_integration/security_and_spaces/group1/config.ts
   - x-pack/test/alerting_api_integration/security_and_spaces/group2/config.ts
   - x-pack/test/alerting_api_integration/security_and_spaces/group3/config.ts
+  - x-pack/test/alerting_api_integration/security_and_spaces/group3/config_with_schedule_circuit_breaker.ts
   - x-pack/test/alerting_api_integration/security_and_spaces/group2/config_non_dedicated_task_runner.ts
   - x-pack/test/alerting_api_integration/spaces_only/tests/alerting/group1/config.ts
   - x-pack/test/alerting_api_integration/spaces_only/tests/alerting/group2/config.ts
@@ -243,6 +233,7 @@ enabled:
   - x-pack/test/detection_engine_api_integration/security_and_spaces/bundled_prebuilt_rules_package/config.ts
   - x-pack/test/detection_engine_api_integration/security_and_spaces/large_prebuilt_rules_package/config.ts
   - x-pack/test/detection_engine_api_integration/security_and_spaces/update_prebuilt_rules_package/config.ts
+  - x-pack/test/disable_ems/config.ts
   - x-pack/test/encrypted_saved_objects_api_integration/config.ts
   - x-pack/test/examples/config.ts
   - x-pack/test/fleet_api_integration/config.agent.ts
@@ -409,13 +400,25 @@ enabled:
   - x-pack/test/ui_capabilities/spaces_only/config.ts
   - x-pack/test/upgrade_assistant_integration/config.js
   - x-pack/test/usage_collection/config.ts
+  - x-pack/test_serverless/api_integration/test_suites/observability/config.ts
+  - x-pack/test_serverless/api_integration/test_suites/search/config.ts
+  - x-pack/test_serverless/api_integration/test_suites/security/config.ts
+  - x-pack/test_serverless/functional/test_suites/observability/config.ts
+  - x-pack/test_serverless/functional/test_suites/observability/config.examples.ts
+  - x-pack/test_serverless/api_integration/test_suites/observability/config.feature_flags.ts
+  - x-pack/test_serverless/functional/test_suites/search/config.ts
+  - x-pack/test_serverless/functional/test_suites/search/config.examples.ts
+  - x-pack/test_serverless/functional/test_suites/search/config.screenshots.ts
+  - x-pack/test_serverless/functional/test_suites/security/config.ts
+  - x-pack/test_serverless/functional/test_suites/security/config.examples.ts
   - x-pack/performance/journeys/ecommerce_dashboard.ts
   - x-pack/performance/journeys/ecommerce_dashboard_map_only.ts
   - x-pack/performance/journeys/flight_dashboard.ts
   - x-pack/performance/journeys/login.ts
   - x-pack/performance/journeys/many_fields_discover.ts
   - x-pack/performance/journeys/many_fields_lens_editor.ts
   - x-pack/performance/journeys/many_fields_transform.ts
+  - x-pack/performance/journeys/tsdb_logs_data_visualizer.ts
   - x-pack/performance/journeys/promotion_tracking_dashboard.ts
   - x-pack/performance/journeys/web_logs_dashboard.ts
   - x-pack/performance/journeys/data_stress_test_lens.ts

.buildkite/hooks/post-command

@@ -1,3 +1,7 @@
 #!/usr/bin/env bash
 
-.buildkite/scripts/lifecycle/post_command.sh
+if [[ "$BUILDKITE_AGENT_NAME" =~ ^bk-agent ]]; then
+  echo "Pipeline file triggered from outside the kibana executors, skipping post_command"
+else
+  .buildkite/scripts/lifecycle/post_command.sh
+fi

.buildkite/hooks/pre-command

@@ -1,3 +1,7 @@
 #!/usr/bin/env bash
 
-source .buildkite/scripts/lifecycle/pre_command.sh
+if [[ "$BUILDKITE_AGENT_NAME" =~ ^bk-agent ]]; then
+  echo "Pipeline file triggered from outside the kibana executors, skipping pre_command"
+else
+  source .buildkite/scripts/lifecycle/pre_command.sh
+fi

.buildkite/pipelines/flaky_tests/groups.json

@@ -1,21 +1,37 @@
 {
   "groups": [
+    {
+      "key": "cypress/security_solution",
+      "name": "Security Solution - Cypress"
+    },
+    {
+      "key": "cypress/security_serverless",
+      "name": "[Serverless] Security Solution - Cypress"
+    },
     {
       "key": "cypress/security_solution_investigations",
       "name": "Security Solution Investigations - Cypress"
     },
     {
-      "key": "cypress/security_solution",
-      "name": "Security Solution - Cypress"
+      "key": "cypress/security_serverless_investigations",
+      "name": "[Serverless] Security Solution Investigations - Cypress"
     },
     {
       "key": "cypress/security_solution_explore",
       "name": "Security Solution Explore - Cypress"
     },
+    {
+      "key": "cypress/security_serverless_explore",
+      "name": "[Serverless] Security Solution Explore - Cypress"
+    },
     {
       "key": "cypress/osquery_cypress",
       "name": "Osquery - Cypress"
     },
+    {
+      "key": "cypress/security_serverless_osquery",
+      "name": "[Serverless] Osquery - Cypress"
+    },
     {
       "key": "cypress/fleet_cypress",
       "name": "Fleet - Cypress"

.buildkite/pipelines/on_merge.yml

@@ -78,16 +78,44 @@ steps:
         - exit_status: '*'
           limit: 1
 
-  - command: '.buildkite/scripts/steps/functional/on_merge_unsupported_ftrs.sh'
-    label: Trigger unsupported ftr tests
-    timeout_in_minutes: 10
-    depends_on:
-      - build
+  - command: .buildkite/scripts/steps/functional/security_serverless.sh
+    label: 'Serverless Security Cypress Tests'
     agents:
-      queue: 'kibana-default'
+      queue: n2-4-spot
+    depends_on: build
+    timeout_in_minutes: 40
+    parallelism: 2
+    retry:
+      automatic:
+        - exit_status: '*'
+          limit: 1
+
+  - command: .buildkite/scripts/steps/functional/security_serverless_explore.sh
+    label: 'Serverless Explore - Security Solution Cypress Tests'
+    agents:
+      queue: n2-4-spot
+    depends_on: build
+    timeout_in_minutes: 60
+    parallelism: 2
+    retry:
+      automatic:
+        - exit_status: '*'
+          limit: 1
+
+  - command: .buildkite/scripts/steps/functional/security_serverless_investigations.sh
+    label: 'Serverless Investigations - Security Solution Cypress Tests'
+    agents:
+      queue: n2-4-spot
+    depends_on: build
+    timeout_in_minutes: 120
+    parallelism: 2
+    retry:
+      automatic:
+        - exit_status: '*'
+          limit: 1
 
-  - command: '.buildkite/scripts/steps/functional/on_merge_serverless_ftrs.sh'
-    label: Trigger serverless ftr tests
+  - command: '.buildkite/scripts/steps/functional/on_merge_unsupported_ftrs.sh'
+    label: Trigger unsupported ftr tests
     timeout_in_minutes: 10
     depends_on:
       - build

.buildkite/pipelines/on_merge_unsupported_ftrs.yml

@@ -91,13 +91,11 @@ steps:
       queue: n2-4-spot
     depends_on: build
     timeout_in_minutes: 120
-    parallelism: 2
+    parallelism: 6
     retry:
       automatic:
         - exit_status: '*'
           limit: 1
-    artifact_paths:
-      - "target/kibana-security-solution/**/*"
 
   - command: .buildkite/scripts/steps/functional/osquery_cypress.sh
     label: 'Osquery Cypress Tests'
@@ -110,8 +108,6 @@ steps:
       automatic:
         - exit_status: '*'
           limit: 1
-    artifact_paths:
-      - "target/kibana-osquery/**/*"
 
   - command: .buildkite/scripts/steps/functional/synthetics_plugin.sh
     label: 'Synthetics @elastic/synthetics Tests'

.buildkite/pipelines/pipeline.kibana-serverless-release.yaml

@@ -2,8 +2,14 @@ steps:
   - label: ":releasethekraken: Release kibana"
     # https://regex101.com/r/tY52jo/1
     if: build.tag =~ /^deploy@\d+\$/
-    trigger: gpctl-promote
+    trigger: gpctl-promote-with-e2e-tests
     build:
       env:
         SERVICE_COMMIT_HASH: "${BUILDKITE_COMMIT:0:12}"
-        REMOTE_SERVICE_CONFIG: https://raw.githubusercontent.com/elastic/serverless-gitops/main/gen/gpctl/kibana/tagged-release.yaml
+        REMOTE_SERVICE_CONFIG: https://raw.githubusercontent.com/elastic/serverless-gitops/main/gen/gpctl/kibana/config.yaml
+        SERVICE: kibana-controller
+        NAMESPACE: kibana-ci
+        IMAGE_NAME: kibana-serverless
+
+notify:
+  - slack: "#kibana-mission-control"

.buildkite/pipelines/pull_request/base.yml

@@ -56,98 +56,17 @@ steps:
         - exit_status: '*'
           limit: 1
 
-  - command: SERVERLESS_ENVIRONMENT=observability .buildkite/scripts/steps/functional/serverless_ftr.sh
-    label: 'Serverless Observability Tests'
-    agents:
-      queue: n2-4-spot
-    depends_on: build
-    timeout_in_minutes: 40
-    soft_fail:
-      - exit_status: 10
-    retry:
-      automatic:
-        - exit_status: '-1'
-          limit: 3
-
-  - command: SERVERLESS_ENVIRONMENT=observability.examples .buildkite/scripts/steps/functional/serverless_ftr.sh
-    label: 'Serverless Observability Examples Tests'
-    agents:
-      queue: n2-4-spot
-    depends_on: build
-    timeout_in_minutes: 40
-    soft_fail:
-      - exit_status: 10
-    retry:
-      automatic:
-        - exit_status: '-1'
-          limit: 3
-
-  - command: SERVERLESS_ENVIRONMENT=search .buildkite/scripts/steps/functional/serverless_ftr.sh
-    label: 'Serverless Search Tests'
-    agents:
-      queue: n2-4-spot
-    depends_on: build
-    timeout_in_minutes: 40
-    soft_fail:
-      - exit_status: 10
-    retry:
-      automatic:
-        - exit_status: '-1'
-          limit: 3
-
-  - command: SERVERLESS_ENVIRONMENT=search.examples .buildkite/scripts/steps/functional/serverless_ftr.sh
-    label: 'Serverless Search Examples Tests'
-    agents:
-      queue: n2-4-spot
-    depends_on: build
-    timeout_in_minutes: 40
-    soft_fail:
-      - exit_status: 10
-    retry:
-      automatic:
-        - exit_status: '-1'
-          limit: 3
-
-  - command: SERVERLESS_ENVIRONMENT=security .buildkite/scripts/steps/functional/serverless_ftr.sh
-    label: 'Serverless Security Tests'
-    agents:
-      queue: n2-4-spot
-    depends_on: build
-    timeout_in_minutes: 40
-    soft_fail:
-      - exit_status: 10
-    retry:
-      automatic:
-        - exit_status: '-1'
-          limit: 3
-
-  - command: SERVERLESS_ENVIRONMENT=security.examples .buildkite/scripts/steps/functional/serverless_ftr.sh
-    label: 'Serverless Security Examples Tests'
-    agents:
-      queue: n2-4-spot
-    depends_on: build
-    timeout_in_minutes: 40
-    soft_fail:
-      - exit_status: 10
-    retry:
-      automatic:
-        - exit_status: '-1'
-          limit: 3
-
   - command: .buildkite/scripts/steps/functional/security_serverless.sh
     label: 'Serverless Security Cypress Tests'
     agents:
       queue: n2-4-spot
     depends_on: build
     timeout_in_minutes: 40
-    parallelism: 16
-    soft_fail: true
+    parallelism: 2
     retry:
       automatic:
         - exit_status: '*'
           limit: 1
-    artifact_paths:
-      - "target/kibana-security-solution/**/*"
 
   # status_exception: Native role management is not enabled in this Elasticsearch instance
   # - command: .buildkite/scripts/steps/functional/security_serverless_defend_workflows.sh
@@ -156,28 +75,22 @@ steps:
   #     queue: n2-4-spot
   #   depends_on: build
   #   timeout_in_minutes: 40
-  #   soft_fail: true
   #   retry:
   #     automatic:
   #       - exit_status: '*'
   #         limit: 1
-  #   artifact_paths:
-  #     - "target/kibana-security-solution/**/*"
 
   - command: .buildkite/scripts/steps/functional/security_serverless_investigations.sh
     label: 'Serverless Security Investigations Cypress Tests'
     agents:
       queue: n2-4-spot
     depends_on: build
     timeout_in_minutes: 40
-    parallelism: 6
-    soft_fail: true
+    parallelism: 2
     retry:
       automatic:
         - exit_status: '*'
           limit: 1
-    artifact_paths:
-      - "target/kibana-security-solution/**/*"
 
   - command: .buildkite/scripts/steps/functional/security_serverless_explore.sh
     label: 'Serverless Security Explore Cypress Tests'
@@ -186,13 +99,10 @@ steps:
     depends_on: build
     timeout_in_minutes: 40
     parallelism: 2
-    soft_fail: true
     retry:
       automatic:
         - exit_status: '*'
           limit: 1
-    artifact_paths:
-      - "target/kibana-security-solution/**/*"
 
   - command: .buildkite/scripts/steps/lint.sh
     label: 'Linting'