[ci] move scout scripts under ".buildkite/scripts/steps/test/scout" (elastic#253420)

dmlemeshko · csr · web-flow · commit 585f16941aa1 · 2026-02-17T23:32:54.000+01:00
## Summary closes elastic/appex-qa-team#697 PR moves Scout CI scripts under `.buildkite/scripts/steps/test/scout/` and explcitly sets Appex-qa Team as code ownership. It was previously discussed during DevEx meeting. --------- Co-authored-by: Cesare de Cal <cesare.decal@elastic.co>
diff --git a/.buildkite/pipelines/chrome_forward_testing.yml b/.buildkite/pipelines/chrome_forward_testing.yml
@@ -70,7 +70,7 @@ steps:
         - exit_status: '*'
           limit: 1
 
-  - command: .buildkite/scripts/steps/test/scout_test_run_builder.sh
+  - command: .buildkite/scripts/steps/test/scout/test_run_builder.sh
     label: 'Scout Test Run Builder'
     agents:
       machineType: n2-standard-4
@@ -79,7 +79,7 @@ steps:
     depends_on:
       - build
     env:
-      SCOUT_CONFIGS_SCRIPT: '.buildkite/scripts/steps/test/scout_configs.sh'
+      SCOUT_CONFIGS_SCRIPT: '.buildkite/scripts/steps/test/scout/configs.sh'
     retry:
       automatic:
         - exit_status: '*'
diff --git a/.buildkite/pipelines/es_serverless/verify_es_serverless_image.yml b/.buildkite/pipelines/es_serverless/verify_es_serverless_image.yml
@@ -62,7 +62,7 @@ steps:
             - exit_status: '*'
               limit: 1
 
-      - command: .buildkite/scripts/steps/test/scout_test_run_builder.sh
+      - command: .buildkite/scripts/steps/test/scout/test_run_builder.sh
         label: 'Scout Test Run Builder'
         agents:
           image: family/kibana-ubuntu-2404
@@ -76,7 +76,7 @@ steps:
           - build
         env:
           SERVERLESS_TESTS_ONLY: 'true'
-          SCOUT_CONFIGS_SCRIPT: '.buildkite/scripts/steps/test/scout_configs.sh'
+          SCOUT_CONFIGS_SCRIPT: '.buildkite/scripts/steps/test/scout/configs.sh'
         retry:
           automatic:
             - exit_status: '*'
diff --git a/.buildkite/pipelines/es_snapshots/verify.yml b/.buildkite/pipelines/es_snapshots/verify.yml
@@ -56,7 +56,7 @@ steps:
         - exit_status: '*'
           limit: 1
 
-  - command: .buildkite/scripts/steps/test/scout_test_run_builder.sh
+  - command: .buildkite/scripts/steps/test/scout/test_run_builder.sh
     label: 'Scout Test Run Builder'
     agents:
       image: family/kibana-ubuntu-2404
@@ -68,7 +68,7 @@ steps:
     depends_on:
       - build
     env:
-      SCOUT_CONFIGS_SCRIPT: '.buildkite/scripts/steps/test/scout_configs.sh'
+      SCOUT_CONFIGS_SCRIPT: '.buildkite/scripts/steps/test/scout/configs.sh'
     retry:
       automatic:
         - exit_status: '*'
diff --git a/.buildkite/pipelines/flaky_tests/pipeline.ts b/.buildkite/pipelines/flaky_tests/pipeline.ts
@@ -150,7 +150,7 @@ steps.push({
 
 if (hasScoutSuites) {
   steps.push({
-    command: '.buildkite/scripts/steps/test/scout_discover_playwright_configs.sh',
+    command: '.buildkite/scripts/steps/test/scout/discover_playwright_configs.sh',
     label: 'Discover Scout Playwright configs',
     agents: expandAgentQueue('n2-4-spot'),
     key: 'scout_playwright_configs',
@@ -194,7 +194,7 @@ for (const testSuite of testSuites) {
     const usesParallelWorkers = testSuite.scoutConfig.endsWith('parallel.playwright.config.ts');
 
     steps.push({
-      command: `.buildkite/scripts/steps/test/scout_flaky_configs.sh`,
+      command: `.buildkite/scripts/steps/test/scout/flaky_configs.sh`,
       env: {
         SCOUT_CONFIG: testSuite.scoutConfig,
         SCOUT_REPORTER_ENABLED: 'true',
diff --git a/.buildkite/pipelines/fleet/package_registry.yml b/.buildkite/pipelines/fleet/package_registry.yml
@@ -49,7 +49,7 @@ steps:
         - exit_status: '*'
           limit: 1
 
-  - command: .buildkite/scripts/steps/test/scout_test_run_builder.sh
+  - command: .buildkite/scripts/steps/test/scout/test_run_builder.sh
     label: 'Scout Test Run Builder'
     agents:
       image: family/kibana-ubuntu-2404
@@ -61,7 +61,7 @@ steps:
     depends_on:
       - build
     env:
-      SCOUT_CONFIGS_SCRIPT: '.buildkite/scripts/steps/test/scout_configs.sh'
+      SCOUT_CONFIGS_SCRIPT: '.buildkite/scripts/steps/test/scout/configs.sh'
     retry:
       automatic:
         - exit_status: '*'
diff --git a/.buildkite/pipelines/node_glibc_217.yml b/.buildkite/pipelines/node_glibc_217.yml
@@ -49,7 +49,7 @@ steps:
         - exit_status: '*'
           limit: 1
 
-  - command: .buildkite/scripts/steps/test/scout_test_run_builder.sh
+  - command: .buildkite/scripts/steps/test/scout/test_run_builder.sh
     label: 'Scout Test Run Builder'
     agents:
       image: family/kibana-ubuntu-2404
@@ -61,7 +61,7 @@ steps:
     depends_on:
       - build
     env:
-      SCOUT_CONFIGS_SCRIPT: '.buildkite/scripts/steps/test/scout_configs.sh'
+      SCOUT_CONFIGS_SCRIPT: '.buildkite/scripts/steps/test/scout/configs.sh'
     retry:
       automatic:
         - exit_status: '*'
diff --git a/.buildkite/pipelines/node_pointer_compression.yml b/.buildkite/pipelines/node_pointer_compression.yml
@@ -51,7 +51,7 @@ steps:
         - exit_status: '*'
           limit: 1
 
-  - command: .buildkite/scripts/steps/test/scout_test_run_builder.sh
+  - command: .buildkite/scripts/steps/test/scout/test_run_builder.sh
     label: 'Scout Test Run Builder'
     agents:
       image: family/kibana-ubuntu-2404
@@ -63,7 +63,7 @@ steps:
     depends_on:
       - build
     env:
-      SCOUT_CONFIGS_SCRIPT: '.buildkite/scripts/steps/test/scout_configs.sh'
+      SCOUT_CONFIGS_SCRIPT: '.buildkite/scripts/steps/test/scout/configs.sh'
     retry:
       automatic:
         - exit_status: '*'
diff --git a/.buildkite/pipelines/on_merge.yml b/.buildkite/pipelines/on_merge.yml
@@ -228,7 +228,7 @@ steps:
         - exit_status: '*'
           limit: 1
 
-  - command: .buildkite/scripts/steps/test/scout_test_run_builder.sh
+  - command: .buildkite/scripts/steps/test/scout/test_run_builder.sh
     label: 'Scout Test Run Builder'
     agents:
       image: family/kibana-ubuntu-2404
@@ -242,7 +242,7 @@ steps:
       - build
     env:
       SCOUT_CONFIGS_DEPS: 'build_scout_tests,quick_checks,checks,linting,linting_with_types,check_types'
-      SCOUT_CONFIGS_SCRIPT: '.buildkite/scripts/steps/test/scout_configs.sh'
+      SCOUT_CONFIGS_SCRIPT: '.buildkite/scripts/steps/test/scout/configs.sh'
     retry:
       automatic:
         - exit_status: '*'
diff --git a/.buildkite/pipelines/pull_request/base.yml b/.buildkite/pipelines/pull_request/base.yml
@@ -121,7 +121,7 @@ steps:
         - exit_status: '*'
           limit: 1
 
-  - command: .buildkite/scripts/steps/test/scout_test_run_builder.sh
+  - command: .buildkite/scripts/steps/test/scout/test_run_builder.sh
     label: 'Scout Test Run Builder'
     agents:
       machineType: n2d-standard-8
@@ -131,7 +131,7 @@ steps:
       - build
     env:
       SCOUT_CONFIGS_DEPS: 'build_scout_tests,quick_checks,checks,linting,linting_with_types,check_types'
-      SCOUT_CONFIGS_SCRIPT: '.buildkite/scripts/steps/test/scout_configs.sh'
+      SCOUT_CONFIGS_SCRIPT: '.buildkite/scripts/steps/test/scout/configs.sh'
     retry:
       automatic:
         - exit_status: '*'
diff --git a/.buildkite/pipelines/uiam/verify_and_promote.yml b/.buildkite/pipelines/uiam/verify_and_promote.yml
@@ -33,7 +33,7 @@ steps:
         - exit_status: '-1'
           limit: 3
 
-  - command: .buildkite/scripts/steps/test/scout_test_run_builder.sh
+  - command: .buildkite/scripts/steps/test/scout/test_run_builder.sh
     label: 'Scout Test Run Builder'
     agents:
       image: family/kibana-ubuntu-2404
@@ -48,7 +48,7 @@ steps:
     env:
       UIAM_DOCKER_IMAGE: $UIAM_IMAGE
       SERVERLESS_TESTS_ONLY: 'true'
-      SCOUT_CONFIGS_SCRIPT: '.buildkite/scripts/steps/test/scout_configs.sh'
+      SCOUT_CONFIGS_SCRIPT: '.buildkite/scripts/steps/test/scout/configs.sh'
     retry:
       automatic:
         - exit_status: '*'
diff --git a/.buildkite/scout_ci_config.yml b/.buildkite/scout_ci_config.yml
@@ -42,7 +42,10 @@ packages:
   enabled:
     - kbn-streamlang-tests
   disabled:
-    - kbn-scout # Internal scout tests are run in advance to validate Scout integrity (see .buildkite/scripts/steps/test/scout_test_run_builder.sh)
+    # Scout's own tests are executed first to validate the Scout framework
+    # (see .buildkite/scripts/steps/test/scout/test_run_builder.sh). Excluded here
+    # so they don't rerun alongside plugin/package Scout tests discovered later.
+    - kbn-scout
     - kbn-scout-release-testing # Release tests will run separately as part of the release process
     - kbn-evals-suite-agent-builder # Evaluation suite is run in dedicated eval pipelines, but Scout config must be registered for discovery validation
 
diff --git a/.buildkite/scripts/steps/code_coverage/jest_parallel.sh b/.buildkite/scripts/steps/code_coverage/jest_parallel.sh
@@ -87,7 +87,7 @@ echo "--- Jest [$TEST_TYPE] configs complete"
 printf "%s\n" "${results[@]}"
 
 # Scout reporter
-source .buildkite/scripts/steps/test/scout_upload_report_events.sh
+source .buildkite/scripts/steps/test/scout/upload_report_events.sh
 
 # Force exit 0 to ensure the next build step starts.
 exit 0
diff --git a/.buildkite/scripts/steps/test/jest_parallel.sh b/.buildkite/scripts/steps/test/jest_parallel.sh
@@ -77,6 +77,6 @@ if [ $code -ne 0 ]; then
 fi
 
 # Scout reporter
-source .buildkite/scripts/steps/test/scout_upload_report_events.sh
+source .buildkite/scripts/steps/test/scout/upload_report_events.sh
 
 exit $exitCode
diff --git a/.buildkite/scripts/steps/test/scout/configs.sh b/.buildkite/scripts/steps/test/scout/configs.sh
diff --git a/.buildkite/scripts/steps/test/scout/discover_playwright_configs.sh b/.buildkite/scripts/steps/test/scout/discover_playwright_configs.sh
diff --git a/.buildkite/scripts/steps/test/scout/flaky_configs.sh b/.buildkite/scripts/steps/test/scout/flaky_configs.sh
diff --git a/.buildkite/scripts/steps/test/scout/test_run_builder.sh b/.buildkite/scripts/steps/test/scout/test_run_builder.sh
@@ -45,7 +45,7 @@ else
   echo 'EUI website is not available - skipping EUI Helpers Tests'
 fi
 
-source .buildkite/scripts/steps/test/scout_upload_report_events.sh
+source .buildkite/scripts/steps/test/scout/upload_report_events.sh
 
 echo '--- Producing Scout Test Execution Steps'
-ts-node "$(dirname "${0}")/scout_test_run_builder.ts"
+ts-node "$(dirname "${0}")/test_run_builder.ts"
diff --git a/.buildkite/scripts/steps/test/scout/test_run_builder.ts b/.buildkite/scripts/steps/test/scout/test_run_builder.ts
diff --git a/.buildkite/scripts/steps/test/scout/upload_report_events.sh b/.buildkite/scripts/steps/test/scout/upload_report_events.sh
diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
@@ -1973,6 +1973,7 @@ x-pack/platform/plugins/shared/ml/server/models/data_recognizer/modules/security
 /.buildkite/scripts/steps/code_generation/cases_codegen.sh @elastic/kibana-cases
 /.buildkite/scripts/steps/security @elastic/kibana-security
 /.buildkite/scripts/steps/entity_store_performance @elastic/contextual-security
+/.buildkite/scripts/steps/test/scout/ @elastic/appex-qa @elastic/kibana-operations
 /kbn_pm/ @elastic/kibana-operations
 /x-pack/dev-tools @elastic/kibana-operations
 /catalog-info.yaml @elastic/kibana-operations @elastic/kibana-tech-leads
