Merge branch 'main' into improve-ftr-retry

Author: maryam-saeidi

.buildkite/pipeline-utils/ci-stats/pick_test_group_run_order.ts

@@ -338,7 +338,7 @@ export async function pickTestGroupRunOrder() {
     : [];
 
   const jestIntegrationConfigs = LIMIT_CONFIG_TYPE.includes('integration')
-    ? globby.sync(getJestConfigGlobs(['**/jest.integration.config.js', '!**/__fixtures__/**']), {
+    ? globby.sync(getJestConfigGlobs(['**/jest.integration.config.*js', '!**/__fixtures__/**']), {
         cwd: process.cwd(),
         absolute: false,
         ignore: DISABLED_JEST_CONFIGS,

.buildkite/scripts/steps/checks/telemetry.sh

@@ -7,8 +7,8 @@ source .buildkite/scripts/common/util.sh
 echo --- Check Telemetry Schema
 
 if is_pr && ! is_auto_commit_disabled; then
-  node scripts/telemetry_check --baseline "$GITHUB_PR_MERGE_BASE" --fix
+  node scripts/telemetry_check --baseline "${GITHUB_PR_MERGE_BASE:-}" --fix
   check_for_changed_files "node scripts/telemetry_check" true
 else
-  node scripts/telemetry_check --baseline "$GITHUB_PR_MERGE_BASE"
+  node scripts/telemetry_check --baseline "${GITHUB_PR_MERGE_BASE:-}"
 fi

.buildkite/scripts/steps/test/jest_parallel.sh

@@ -11,20 +11,26 @@ results=()
 configs=""
 failedConfigs=""
 
+# Parallel execution tuning (can be overridden via env)
+#   JEST_MAX_PARALLEL: number of concurrent Jest config processes
+#   JEST_MAX_OLD_SPACE_MB: per-process max old space size (MB)
+# NOTE: JEST_MAX_PARALLEL default now depends on TEST_TYPE (unit=3, integration=1).
+# It can still be overridden by exporting JEST_MAX_PARALLEL.
+JEST_MAX_PARALLEL="${JEST_MAX_PARALLEL:-3}"
+JEST_MAX_OLD_SPACE_MB="${JEST_MAX_OLD_SPACE_MB:-8192}"
+
 if [[ "$1" == 'jest.config.js' ]]; then
-  # we used to run jest tests in parallel but started to see a lot of flakiness in libraries like react-dom/test-utils:
-  # https://github.com/elastic/kibana/issues/141477
-  # parallelism="-w2"
-  parallelism="--runInBand"
+  # unit tests
   TEST_TYPE="unit"
+  JEST_MAX_PARALLEL=3 # unit tests run in parallel by default. When adjusting Buildkite resources, dont forget to update this value.
 else
-  # run integration tests in-band
-  parallelism="--runInBand"
   TEST_TYPE="integration"
+  JEST_MAX_PARALLEL=1 # integration tests should not run in parallel by default.
 fi
 
 export TEST_TYPE
 
+
 # Added section for tracking and retrying failed configs
 FAILED_CONFIGS_KEY="${BUILDKITE_STEP_ID}${TEST_TYPE}${JOB}"
 
@@ -50,71 +56,43 @@ fi
 echo "+++ ⚠️ WARNING ⚠️"
 echo "
   console.log(), console.warn(), and console.error() output in jest tests causes a massive amount
-  of noise on CI without any percevable benefit, so they have been disabled. If you want to log
+  of noise on CI without any perceivable benefit, so they have been disabled. If you want to log
   output in your test temporarily, you can modify 'src/platform/packages/shared/kbn-test/src/jest/setup/disable_console_logs.js'
 "
 
-while read -r config; do
-  echo "--- $ node scripts/jest --config $config"
-
-  # --trace-warnings to debug
-  # Node.js process-warning detected:
-  # Warning: Closing file descriptor 24 on garbage collection
-  cmd="NODE_OPTIONS=\"--max-old-space-size=12288 --trace-warnings --no-experimental-require-module"
-
-  if [ "${KBN_ENABLE_FIPS:-}" == "true" ]; then
-    cmd=$cmd" --enable-fips --openssl-config=$HOME/nodejs.cnf"
-  fi
-
-  cmd=$cmd"\" NODE_ENV=test node ./scripts/jest --config=\"$config\" $parallelism --coverage=false --passWithNoTests"
+# Execute all configs through the combined jest_all runner.
+# The new runner will handle iterating through configs and reporting.
 
-  echo "actual full command is:"
-  echo "$cmd"
-  echo ""
+# Flatten configs (newline separated) into comma-separated list for flag usage.
+CONFIGS_CSV=$(echo "$configs" | tr '\n' ',' | sed 's/,$//')
 
-  start=$(date +%s)
+echo "--- Running combined jest_all for configs ($TEST_TYPE)"
+echo "$configs"
+echo "JEST_MAX_PARALLEL is set to: $JEST_MAX_PARALLEL"
 
-  # prevent non-zero exit code from breaking the loop
-  set +e;
-  eval "$cmd"
-  lastCode=$?
-  set -e;
-
-  timeSec=$(($(date +%s)-start))
-  if [[ $timeSec -gt 60 ]]; then
-    min=$((timeSec/60))
-    sec=$((timeSec-(min*60)))
-    duration="${min}m ${sec}s"
-  else
-    duration="${timeSec}s"
-  fi
+node_opts="--max-old-space-size=${JEST_MAX_OLD_SPACE_MB} --trace-warnings --no-experimental-require-module"
+if [ "${KBN_ENABLE_FIPS:-}" == "true" ]; then
+  node_opts="$node_opts --enable-fips --openssl-config=$HOME/nodejs.cnf"
+fi
 
-  results+=("- $config
-    duration: ${duration}
-    result: ${lastCode}")
+full_command="NODE_OPTIONS=\"$node_opts\" node ./scripts/jest_all --configs=\"$CONFIGS_CSV\" --coverage=false --passWithNoTests --maxParallel=\"$JEST_MAX_PARALLEL\""
 
-  if [ $lastCode -ne 0 ]; then
-    exitCode=10
-    echo "Jest exited with code $lastCode"
-    echo "^^^ +++"
+echo "Actual full command is:"
+echo "$full_command"
+echo ""
 
-    if [[ "$failedConfigs" ]]; then
-      failedConfigs="${failedConfigs}"$'\n'"$config"
-    else
-      failedConfigs="$config"
-    fi
-  fi
-done <<< "$configs"
+set +e
+eval "$full_command"
+code=$?
+set -e
 
-if [[ "$failedConfigs" ]]; then
-  buildkite-agent meta-data set "$FAILED_CONFIGS_KEY" "$failedConfigs"
+if [ $code -ne 0 ]; then
+  exitCode=10
 fi
 
-echo "--- Jest configs complete"
-printf "%s\n" "${results[@]}"
-echo ""
+echo "--- Jest configs complete (combined)"
 
 # Scout reporter
 source .buildkite/scripts/steps/test/scout_upload_report_events.sh
 
-exit $exitCode
+exit $exitCode

.github/CODEOWNERS

@@ -2286,6 +2286,7 @@ x-pack/platform/test/functional/page_objects/search_profiler_page.ts @elastic/se
 /x-pack/solutions/chat/test/serverless/functional/configs/config.ts @elastic/search-kibana @elastic/appex-qa
 /x-pack/platform/test/onechat_api_integration @elastic/search-kibana @elastic/workchat-eng
 /x-pack/platform/test/onechat_functional @elastic/search-kibana @elastic/workchat-eng
+/x-pack/platform/test/functional/page_objects/onechat_page.ts @elastic/workchat-eng
 
 # Management Experience - Deployment Management
 /src/platform/test/functional/fixtures/kbn_archiver/management.json @elastic/kibana-management @elastic/kibana-data-discovery # Assigned per 2 uses: test/functional/apps/management/_import_objects.ts && test/functional/apps/management/data_views/_scripted_fields_filter.ts

.github/workflows/alert-failed-test.yml

@@ -17,6 +17,7 @@ jobs:
           ref: main
           path: ./kibana-operations
           token: ${{secrets.KIBANAMACHINE_TOKEN}}
+          persist-credentials: false
 
       - name: Label failed test issue
         working-directory: ./kibana-operations/triage

.github/workflows/codeql-stats.yml

@@ -17,6 +17,7 @@ jobs:
         ref: main
         path: ./kibana-operations
         token: ${{secrets.KIBANAMACHINE_TOKEN}}
+        persist-credentials: false
 
     - name: CodeQL alert statistics
       working-directory: ./kibana-operations/triage

.github/workflows/codeql.yml

@@ -25,6 +25,7 @@ jobs:
       uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
       with:
         ref: ${{ matrix.branch }}
+        persist-credentials: false
 
     - name: Initialize CodeQL
       uses: github/codeql-action/init@ff0a06e83cb2de871e5a09832bc6a81e7276941f # v3.28.18
@@ -76,6 +77,7 @@ jobs:
         ref: main
         path: ./kibana-operations
         token: ${{secrets.KIBANAMACHINE_TOKEN}}
+        persist-credentials: false
 
     - name: CodeQL alert
       working-directory: ./kibana-operations/triage

.github/workflows/evaluate-dependency-health.yml

@@ -27,6 +27,7 @@ jobs:
           ref: main
           path: ./kibana-operations
           token: ${{secrets.KIBANAMACHINE_TOKEN}}
+          persist-credentials: false
 
       - name: Run dependency health score script
         working-directory: ./kibana-operations/triage

.github/workflows/label-failed-test.yml

@@ -18,6 +18,7 @@ jobs:
           ref: main
           path: ./kibana-operations
           token: ${{secrets.KIBANAMACHINE_TOKEN}}
+          persist-credentials: false
 
       - name: Label failed test issue
         working-directory: ./kibana-operations/triage

.github/workflows/launchdarkly-code-references.yml

@@ -14,6 +14,7 @@ jobs:
       - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
         with:
           fetch-depth: 11 # This value must be set if the lookback configuration option is not disabled for find-code-references. Read more: https://github.com/launchdarkly/ld-find-code-refs#searching-for-unused-flags-extinctions
+          persist-credentials: false
       - name: LaunchDarkly Code References
         uses: launchdarkly/find-code-references@89a7d362d1d4b3725fe0fe0ccd0dc69e3bdcba58 # v2.14.0
         with: