Merge branch 'main' into ml-memory-usage-and-notifications-serverless…

…-tests

.buildkite/ftr_platform_stateful_configs.yml

@@ -282,6 +282,7 @@ enabled:
   - x-pack/test/functional/config.firefox.js
   - x-pack/test/functional/config.upgrade_assistant.ts
   - x-pack/test/functional_cloud/config.ts
+  - x-pack/test/functional_cloud/saml.config.ts
   - x-pack/test/functional_solution_sidenav/config.ts
   - x-pack/test/functional_search/config.ts
   - x-pack/test/kubernetes_security/basic/config.ts
@@ -379,3 +380,4 @@ enabled:
   # stateful config files that run deployment-agnostic tests
   - x-pack/test/api_integration/deployment_agnostic/configs/stateful/platform.stateful.config.ts
   - x-pack/test/api_integration/apis/cloud/config.ts
+  - x-pack/test/api_integration/apis/cloud/saml.config.ts

.buildkite/pipelines/on_merge_unsupported_ftrs.yml

@@ -75,6 +75,8 @@ steps:
       machineType: n2-standard-4
       preemptible: true
     depends_on: build
+    env:
+      PING_SLACK_TEAM: "@obs-ux-management-team"
     timeout_in_minutes: 120
     artifact_paths:
       - 'x-pack/solutions/observability/plugins/synthetics/e2e/.journeys/**/*'
@@ -94,6 +96,8 @@ steps:
       machineType: n2-standard-4
       preemptible: true
     depends_on: build
+    env:
+      PING_SLACK_TEAM: "@obs-ux-infra_services-team"
     timeout_in_minutes: 120
     retry:
       automatic:

.buildkite/pipelines/pull_request/scout_ui_tests.yml

@@ -2,7 +2,7 @@ steps:
   - command: .buildkite/scripts/steps/functional/scout_ui_tests.sh
     label: 'Scout UI Tests'
     agents:
-      machineType: n2-standard-4
+      machineType: n2-standard-8
       preemptible: true
     depends_on:
       - build
@@ -11,7 +11,7 @@ steps:
       - linting
       - linting_with_types
       - check_types
-    timeout_in_minutes: 30
+    timeout_in_minutes: 60
     retry:
       automatic:
         - exit_status: '-1'

.buildkite/pipelines/pull_request/security_solution/defend_workflows.yml

@@ -37,4 +37,4 @@ steps:
     retry:
       automatic:
         - exit_status: '-1'
-          limit: 1
+          limit: 1

.buildkite/scripts/pipelines/pull_request/pipeline.ts

@@ -109,18 +109,6 @@ const getPipeline = (filename: string, removeSteps = true) => {
       pipeline.push(getPipeline('.buildkite/pipelines/pull_request/inventory_cypress.yml'));
     }
 
-    if (
-      (await doAnyChangesMatch([
-        /^x-pack\/solutions\/observability\/plugins\/observability_onboarding/,
-        /^x-pack\/platform\/plugins\/shared\/fleet/,
-      ])) ||
-      GITHUB_PR_LABELS.includes('ci:all-cypress-suites')
-    ) {
-      pipeline.push(
-        getPipeline('.buildkite/pipelines/pull_request/observability_onboarding_cypress.yml')
-      );
-    }
-
     if (
       (await doAnyChangesMatch([/^x-pack\/solutions\/observability\/plugins\/profiling/])) ||
       GITHUB_PR_LABELS.includes('ci:all-cypress-suites')
@@ -405,6 +393,7 @@ const getPipeline = (filename: string, removeSteps = true) => {
     if (
       (await doAnyChangesMatch([
         /^x-pack\/platform\/plugins\/private\/discover_enhanced\/ui_tests/,
+        /^x-pack\/solutions\/observability\/plugins\/observability_onboarding/,
         /^packages\/kbn-scout/,
       ])) ||
       GITHUB_PR_LABELS.includes('ci:scout-ui-tests')

.buildkite/scripts/steps/functional/scalability_dataset_extraction.sh

@@ -36,7 +36,6 @@ buildkite-agent artifact upload "${OUTPUT_DIR}/scalability_traces.tar.gz"
 
 echo "--- Downloading Kibana artifacts used in tests"
 download_artifact kibana-default.tar.gz "${OUTPUT_DIR}/" --build "${KIBANA_BUILD_ID:-$BUILDKITE_BUILD_ID}"
-download_artifact kibana-default-plugins.tar.gz "${OUTPUT_DIR}/" --build "${KIBANA_BUILD_ID:-$BUILDKITE_BUILD_ID}"
 
 echo "--- Adding commit info"
 echo "${BUILDKITE_COMMIT}" > "${OUTPUT_DIR}/KIBANA_COMMIT_HASH"

.buildkite/scripts/steps/functional/scout_ui_tests.sh

@@ -6,29 +6,33 @@ source .buildkite/scripts/steps/functional/common.sh
 
 export JOB=kibana-scout-ui-tests
 
-TEST_CONFIG="x-pack/platform/plugins/private/discover_enhanced/ui_tests/playwright.config.ts"
 KIBANA_DIR="$KIBANA_BUILD_LOCATION"
 
-declare -A TESTS=(
-  ["Stateful"]="--stateful"
-  ["Serverless Elasticsearch"]="--serverless=es"
-  ["Serverless Observability"]="--serverless=oblt"
-  ["Serverless Security"]="--serverless=security"
-)
+run_tests() {
+  local suit_name=$1
+  local config_path=$2
+  local run_mode=$3
 
-ORDER=("Stateful" "Serverless Elasticsearch" "Serverless Observability" "Serverless Security")
-
-EXIT_CODE=0
-
-for TEST_NAME in "${ORDER[@]}"; do
-  RUN_MODE="${TESTS[$TEST_NAME]}"
-  echo "--- $TEST_NAME: 'discover_enhanced' plugin UI Tests"
-  if ! node scripts/scout run-tests "$RUN_MODE" --config "$TEST_CONFIG" --kibana-install-dir "$KIBANA_DIR"; then
-    echo "$TEST_NAME: failed"
+  echo "--- $suit_name ($run_mode) UI Tests"
+  if ! node scripts/scout run-tests "$run_mode" --config "$config_path" --kibana-install-dir "$KIBANA_DIR"; then
+    echo "$suit_name: failed"
     EXIT_CODE=1
   else
-    echo "$TEST_NAME: passed"
+    echo "$suit_name: passed"
   fi
+}
+
+EXIT_CODE=0
+
+# Discovery Enhanced
+for run_mode in "--stateful" "--serverless=es" "--serverless=oblt" "--serverless=security"; do
+  run_tests "Discovery Enhanced" "x-pack/platform/plugins/private/discover_enhanced/ui_tests/playwright.config.ts" "$run_mode"
+done
+
+# Observability Onboarding
+for run_mode in "--stateful" "--serverless=oblt"; do
+  run_tests "Observability Onboarding" "x-pack/solutions/observability/plugins/observability_onboarding/ui_tests/playwright.config.ts" "$run_mode"
 done
 
+
 exit $EXIT_CODE

.buildkite/scripts/steps/scalability/benchmarking.sh

@@ -36,7 +36,6 @@ download_artifacts() {
   tar -xzf "${LATEST_RUN_ARTIFACTS_DIR}/kibana-default.tar.gz" -C "$KIBANA_BUILD_LOCATION" --strip=1
 
   cd "$KIBANA_DIR"
-  tar -xzf "${LATEST_RUN_ARTIFACTS_DIR}/kibana-default-plugins.tar.gz"
   tar -xzf "${LATEST_RUN_ARTIFACTS_DIR}/scalability_traces.tar.gz"
 }