Merge branch 'main' of https://github.com/elastic/kibana into fix/olm…

…-revisit_blocklist_list_labels-3237

.bazelversion

@@ -1 +1 @@
-5.0.0
+5.1.1

.buildkite/pipelines/artifacts.yml

@@ -4,3 +4,29 @@ steps:
     agents:
       queue: c2-16
     timeout_in_minutes: 60
+
+  - wait
+
+  - command: TEST_PACKAGE=deb .buildkite/scripts/steps/package_testing/test.sh
+    label: Package testing for deb
+    agents:
+      queue: n2-4-virt
+    timeout_in_minutes: 20
+
+  - command: TEST_PACKAGE=rpm .buildkite/scripts/steps/package_testing/test.sh
+    label: Package testing for rpm
+    agents:
+      queue: n2-4-virt
+    timeout_in_minutes: 20
+
+  - command: TEST_PACKAGE=docker .buildkite/scripts/steps/package_testing/test.sh
+    label: Package testing for docker
+    agents:
+      queue: n2-4-virt
+    timeout_in_minutes: 20
+
+  - command: .buildkite/scripts/steps/artifacts/docker_context.sh
+    label: 'Docker Build Context'
+    agents:
+      queue: n2-2
+    timeout_in_minutes: 20

.buildkite/pipelines/pull_request/base.yml

@@ -56,7 +56,7 @@ steps:
   - command: .buildkite/scripts/steps/functional/oss_accessibility.sh
     label: 'OSS Accessibility Tests'
     agents:
-      queue: ci-group-4d
+      queue: n2-4-spot
     depends_on: build
     timeout_in_minutes: 120
     retry:
@@ -67,7 +67,7 @@ steps:
   - command: .buildkite/scripts/steps/functional/xpack_accessibility.sh
     label: 'Default Accessibility Tests'
     agents:
-      queue: n2-4
+      queue: n2-4-spot
     depends_on: build
     timeout_in_minutes: 120
     retry:
@@ -78,7 +78,7 @@ steps:
   - command: .buildkite/scripts/steps/functional/oss_firefox.sh
     label: 'OSS Firefox Tests'
     agents:
-      queue: ci-group-4d
+      queue: n2-4-spot
     depends_on: build
     timeout_in_minutes: 120
     retry:
@@ -89,7 +89,7 @@ steps:
   - command: .buildkite/scripts/steps/functional/xpack_firefox.sh
     label: 'Default Firefox Tests'
     agents:
-      queue: n2-4
+      queue: n2-4-spot
     depends_on: build
     timeout_in_minutes: 120
     retry:
@@ -100,7 +100,7 @@ steps:
   - command: .buildkite/scripts/steps/functional/oss_misc.sh
     label: 'OSS Misc Functional Tests'
     agents:
-      queue: n2-4
+      queue: n2-4-spot
     depends_on: build
     timeout_in_minutes: 120
     retry:
@@ -111,7 +111,7 @@ steps:
   - command: .buildkite/scripts/steps/functional/xpack_saved_object_field_metrics.sh
     label: 'Saved Object Field Metrics'
     agents:
-      queue: n2-4
+      queue: n2-4-spot
     depends_on: build
     timeout_in_minutes: 120
     retry:
@@ -138,7 +138,7 @@ steps:
   - command: .buildkite/scripts/steps/test/api_integration.sh
     label: 'API Integration Tests'
     agents:
-      queue: n2-2
+      queue: n2-2-spot
     timeout_in_minutes: 120
     key: api-integration
 
@@ -173,7 +173,7 @@ steps:
   - command: .buildkite/scripts/steps/build_api_docs.sh
     label: 'Build API Docs'
     agents:
-      queue: n2-4
+      queue: n2-4-spot
     key: build_api_docs
     timeout_in_minutes: 60
 

.buildkite/scripts/build_kibana_plugins.sh

@@ -4,6 +4,7 @@ set -euo pipefail
 
 echo "--- Build Platform Plugins"
 node scripts/build_kibana_platform_plugins \
+  --scan-dir "$KIBANA_DIR/test/analytics/__fixtures__/plugins" \
   --scan-dir "$KIBANA_DIR/test/plugin_functional/plugins" \
   --scan-dir "$KIBANA_DIR/test/interpreter_functional/plugins" \
   --scan-dir "$KIBANA_DIR/test/common/fixtures/plugins" \

.buildkite/scripts/common/util.sh

@@ -47,6 +47,11 @@ check_for_changed_files() {
 
       git commit -m "$NEW_COMMIT_MESSAGE"
       git push
+
+      # After the git push, the new commit will trigger a new build within a few seconds and this build should get cancelled
+      # So, let's just sleep to give the build time to cancel itself without an error
+      # If it doesn't get cancelled for some reason, then exit with an error, because we don't want this build to be green (we just don't want it to generate an error either)
+      sleep 300
       exit 1
     else
       echo -e "\n${RED}ERROR: '$1' caused changes to the following files:${C_RESET}\n"

.buildkite/scripts/lifecycle/annotate_test_failures.js

@@ -6,7 +6,6 @@
  * Side Public License, v 1.
  */
 
-// eslint-disable-next-line import/no-unresolved
 const { TestFailures } = require('kibana-buildkite-library');
 
 (async () => {

.buildkite/scripts/lifecycle/build_status.js

@@ -6,7 +6,6 @@
  * Side Public License, v 1.
  */
 
-// eslint-disable-next-line import/no-unresolved
 const { BuildkiteClient } = require('kibana-buildkite-library');
 
 (async () => {

.buildkite/scripts/lifecycle/ci_stats_complete.js

@@ -6,7 +6,6 @@
  * Side Public License, v 1.
  */
 
-// eslint-disable-next-line import/no-unresolved
 const { CiStats } = require('kibana-buildkite-library');
 
 (async () => {

.buildkite/scripts/lifecycle/ci_stats_ready.js

@@ -6,7 +6,6 @@
  * Side Public License, v 1.
  */
 
-// eslint-disable-next-line import/no-unresolved
 const { CiStats } = require('kibana-buildkite-library');
 
 (async () => {

.buildkite/scripts/lifecycle/ci_stats_start.js

@@ -6,7 +6,6 @@
  * Side Public License, v 1.
  */
 
-// eslint-disable-next-line import/no-unresolved
 const { CiStats } = require('kibana-buildkite-library');
 
 (async () => {

.buildkite/scripts/lifecycle/post_command.sh

@@ -2,6 +2,7 @@
 
 set -euo pipefail
 
+echo '--- Agent Debug Info'
 node .buildkite/scripts/lifecycle/print_agent_links.js || true
 
 IS_TEST_EXECUTION_STEP="$(buildkite-agent meta-data get "${BUILDKITE_JOB_ID}_is_test_execution_step" --default '')"

.buildkite/scripts/lifecycle/pre_command.sh

@@ -26,8 +26,17 @@ retry 5 15 install_deps
 
 cd ..
 
+echo '--- Agent Debug/SSH Info'
 node .buildkite/scripts/lifecycle/print_agent_links.js || true
 
+if [[ "$(curl -is metadata.google.internal || true)" ]]; then
+  echo ""
+  echo "To SSH into this agent, run:"
+  echo "gcloud compute ssh --tunnel-through-iap --project elastic-kibana-ci --zone \"$(curl -sH Metadata-Flavor:Google http://metadata.google.internal/computeMetadata/v1/instance/zone)\" \"$(curl -sH Metadata-Flavor:Google http://metadata.google.internal/computeMetadata/v1/instance/name)\""
+  echo ""
+fi
+
+
 echo '--- Job Environment Setup'
 
 # Set up a custom ES Snapshot Manifest if one has been specified for this build

.buildkite/scripts/lifecycle/print_agent_links.js

@@ -6,7 +6,6 @@
  * Side Public License, v 1.
  */
 
-// eslint-disable-next-line import/no-unresolved
 const { BuildkiteClient } = require('kibana-buildkite-library');
 
 (async () => {
@@ -31,7 +30,6 @@ const { BuildkiteClient } = require('kibana-buildkite-library');
       `?time=${startTime.getTime()}`,
     ].join('');
 
-    console.log('--- Agent Debug Links');
     console.log('Agent Metrics:');
     console.log('\u001b]1339;' + `url='${METRICS_URL}'\u0007`);
     console.log('Agent Logs:');

.buildkite/scripts/pipelines/pull_request/pipeline.js

@@ -8,7 +8,6 @@
 
 const execSync = require('child_process').execSync;
 const fs = require('fs');
-// eslint-disable-next-line import/no-unresolved
 const { areChangesSkippable, doAnyChangesMatch } = require('kibana-buildkite-library');
 
 const SKIPPABLE_PATHS = [

.buildkite/scripts/steps/artifacts/build.sh

@@ -41,3 +41,7 @@ if [[ "${RELEASE_BUILD:-}" == "true" ]]; then
     --skip-docker-ubuntu \
     --skip-docker-contexts
 fi
+
+cd target
+buildkite-agent artifact upload "*"
+cd -

.buildkite/scripts/steps/artifacts/docker_context.sh

@@ -0,0 +1,28 @@
+#!/bin/bash
+
+set -euo pipefail
+
+.buildkite/scripts/bootstrap.sh
+
+if [[ "${RELEASE_BUILD:-}" == "true" ]]; then
+  VERSION="$(jq -r '.version' package.json)"
+  RELEASE_ARG="--release"
+else
+  VERSION="$(jq -r '.version' package.json)-SNAPSHOT"
+  RELEASE_ARG=""
+fi
+
+echo "--- Create contexts"
+mkdir -p target
+node scripts/build "$RELEASE_ARG" --skip-initialize --skip-generic-folders --skip-platform-folders --skip-archives --docker-context-use-local-artifact
+
+echo "--- Setup default context"
+DOCKER_BUILD_FOLDER=$(mktemp -d)
+
+tar -xf target/kibana-[0-9]*-docker-build-context.tar.gz -C "$DOCKER_BUILD_FOLDER"
+cd $DOCKER_BUILD_FOLDER
+
+buildkite-agent artifact download "kibana-$VERSION-linux-x86_64.tar.gz" . --build "${KIBANA_BUILD_ID:-$BUILDKITE_BUILD_ID}"
+
+echo "--- Build context"
+docker build .

.buildkite/scripts/steps/code_coverage/ingest.sh

@@ -52,4 +52,4 @@ echo "--- Upload coverage static site"
 .buildkite/scripts/steps/code_coverage/reporting/uploadStaticSite.sh
 
 echo "--- Ingest results to Kibana stats cluster"
-.buildkite/scripts/steps/code_coverage/reporting/ingestData.sh 'elastic+kibana+code-coverage' ${BUILDKITE_BUILD_ID} ${BUILDKITE_BUILD_URL} ${previousSha} 'src/dev/code_coverage/ingest_coverage/team_assignment/team_assignments.txt'
+.buildkite/scripts/steps/code_coverage/reporting/ingestData.sh 'elastic+kibana+code-coverage' ${BUILDKITE_BUILD_NUMBER} ${BUILDKITE_BUILD_URL} ${previousSha} 'src/dev/code_coverage/ingest_coverage/team_assignment/team_assignments.txt'

.buildkite/scripts/steps/functional/oss_misc.sh

@@ -41,3 +41,11 @@ checks-reporter-with-killswitch "Status Integration Tests" \
     --config test/server_integration/http/platform/config.status.ts \
     --bail \
     --debug
+
+# Tests that must be run against source in order to build test plugins
+echo --- Analytics Integration Tests
+checks-reporter-with-killswitch "Analytics Integration Tests" \
+  node scripts/functional_tests \
+    --config test/analytics/config.ts \
+    --bail \
+    --debug

.buildkite/scripts/steps/functional/performance_playwright.sh

@@ -20,9 +20,6 @@ sleep 120
 
 cd "$XPACK_DIR"
 
-jobId=$(npx uuid)
-export TEST_JOB_ID="$jobId"
-
 journeys=("ecommerce_dashboard" "flight_dashboard" "web_logs_dashboard" "promotion_tracking_dashboard")
 
 for i in "${journeys[@]}"; do