Merge branch 'main' into panel-settings-title-focus_2023-12-20

.buildkite/hooks/pre-command

@@ -1,7 +1,8 @@
 #!/usr/bin/env bash
 
 if [[ "$BUILDKITE_AGENT_NAME" =~ ^bk-agent ]]; then
-  echo "Pipeline file triggered from outside the kibana executors, skipping pre_command"
+  echo "Pipeline file triggered from outside the kibana executors, skipping .buildkite/scripts/lifecycle/pre_command.sh"
+  export SONAR_LOGIN=$(vault read -field=token secret/ci/elastic-kibana/sonarqube)
 else
   source .buildkite/scripts/lifecycle/pre_command.sh
 fi

.buildkite/package.json

@@ -8,7 +8,7 @@
   },
   "dependencies": {
     "@octokit/rest": "^18.10.0",
-    "axios": "^0.21.4",
+    "axios": "^1.6.3",
     "globby": "^11.1.0",
     "js-yaml": "^4.1.0",
     "minimatch": "^5.0.1",
@@ -30,4 +30,4 @@
     "#pipeline-utils": "./pipeline-utils/index.ts",
     "#pipeline-utils/*": "./pipeline-utils/*"
   }
-}
+}

.buildkite/pipeline-utils/test-failures/annotate.ts

@@ -91,11 +91,12 @@ export const getPrComment = (
 
         const logsLink = artifactUrl ? ` [[logs]](${artifactUrl})` : '';
 
-        // job name could have #<number> in it, which Github will link to an issue, so we need to "escape" it with spans
-        return `* [[job]](${jobUrl})${logsLink} ${failure.jobName.replace(
-          '#',
-          '#<span></span>'
-        )} / ${failure.name}`;
+        // failure name could have #<number>, which Github will link to an issue or @<string>,
+        // which will send a notification so we need to "escape" it with spans
+        const failureString = `${failure.jobName} / ${failure.name}`
+          .replaceAll('#', '#<span></span>')
+          .replaceAll('@', '@<span></span>');
+        return `* [[job]](${jobUrl})${logsLink} ${failureString}`;
       })
       .join('\n')
   );

.buildkite/pipelines/artifacts.yml

@@ -51,16 +51,6 @@ steps:
         - exit_status: '*'
           limit: 1
 
-  - command: KIBANA_DOCKER_CONTEXT=ubi8 .buildkite/scripts/steps/artifacts/docker_context.sh
-    label: 'Docker Context Verification'
-    agents:
-      queue: n2-2
-    timeout_in_minutes: 30
-    retry:
-      automatic:
-        - exit_status: '*'
-          limit: 1
-
   - command: KIBANA_DOCKER_CONTEXT=ubi .buildkite/scripts/steps/artifacts/docker_context.sh
     label: 'Docker Context Verification'
     agents:
@@ -88,7 +78,7 @@ steps:
       - exit_status: -1
     agents:
       queue: n2-2
-    timeout_in_minutes: 30
+    timeout_in_minutes: 60
     if: "build.env('RELEASE_BUILD') == null || build.env('RELEASE_BUILD') == '' || build.env('RELEASE_BUILD') == 'false'"
     retry:
       automatic:

.buildkite/pipelines/sonarqube.yml

@@ -1,4 +1,5 @@
-
-steps:
-  - label: Placeholder
-    command: echo "Hello!"
+  - label: ":sonarqube: Continuous Code Inspection"
+    agents:
+      image: docker.elastic.co/cloud-ci/sonarqube/buildkite-scanner:latest
+      memory: 16G
+    command: /scan-source-code.sh

.buildkite/scripts/lifecycle/pre_command.sh

@@ -142,6 +142,12 @@ export SYNTHETICS_REMOTE_KIBANA_URL
 DEPLOY_TAGGER_SLACK_WEBHOOK_URL=${DEPLOY_TAGGER_SLACK_WEBHOOK_URL:-"$(vault_get kibana-serverless-release-tools DEPLOY_TAGGER_SLACK_WEBHOOK_URL)"}
 export DEPLOY_TAGGER_SLACK_WEBHOOK_URL
 
+GCS_SA_CDN_QA_KEY="$(vault_get gcs-sa-cdn-qa key)"
+export GCS_SA_CDN_QA_KEY
+
+GCS_SA_CDN_QA_BUCKET="$(vault_get gcs-sa-cdn-qa bucket)"
+export GCS_SA_CDN_QA_BUCKET
+
 # Setup Failed Test Reporter Elasticsearch credentials
 {
   TEST_FAILURES_ES_CLOUD_ID=$(vault_get failed_tests_reporter_es cloud_id)

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

@@ -23,11 +23,7 @@ case $KIBANA_DOCKER_CONTEXT in
   cloud)
     DOCKER_CONTEXT_FILE="kibana-cloud-$FULL_VERSION-docker-build-context.tar.gz"
   ;;
-  ubi8)
-    DOCKER_CONTEXT_FILE="kibana-ubi8-$FULL_VERSION-docker-build-context.tar.gz"
-  ;;
   ubi)
-    # Currently ubi9.  After ubi8 we're moving to a version agnostic filename
     DOCKER_CONTEXT_FILE="kibana-ubi-$FULL_VERSION-docker-build-context.tar.gz"
   ;;
   ironbank)

.buildkite/scripts/steps/artifacts/docker_image.sh

@@ -26,7 +26,7 @@ if docker manifest inspect $KIBANA_IMAGE &> /dev/null; then
   exit 1
 fi
 
-echo "--- Build images"
+echo "--- Build Kibana"
 node scripts/build \
   --debug \
   --release \
@@ -37,8 +37,7 @@ node scripts/build \
   --skip-docker-ubuntu \
   --skip-docker-ubi \
   --skip-docker-cloud \
-  --skip-docker-contexts \
-  --skip-cdn-assets
+  --skip-docker-contexts
 
 echo "--- Tag images"
 docker rmi "$KIBANA_IMAGE"
@@ -88,12 +87,21 @@ fi
 echo "--- Build dependencies report"
 node scripts/licenses_csv_report "--csv=target/dependencies-$GIT_ABBREV_COMMIT.csv"
 
-echo "--- Upload artifacts"
+echo "--- Upload CDN assets"
 cd target
+gcloud auth activate-service-account --key-file <(echo "$GCS_SA_CDN_QA_KEY")
+
+CDN_ASSETS_FOLDER=$(mktemp -d)
+tar -xf "kibana-$BASE_VERSION-cdn-assets.tar.gz" -C "$CDN_ASSETS_FOLDER" --strip=1
+
+gsutil -m cp -r "$CDN_ASSETS_FOLDER/*" "gs://$GCS_SA_CDN_QA_BUCKET/$GIT_ABBREV_COMMIT"
+
+echo "--- Upload archives"
 buildkite-agent artifact upload "kibana-$BASE_VERSION-linux-x86_64.tar.gz"
 buildkite-agent artifact upload "kibana-$BASE_VERSION-linux-aarch64.tar.gz"
 buildkite-agent artifact upload "kibana-$BASE_VERSION-docker-image.tar.gz"
 buildkite-agent artifact upload "kibana-$BASE_VERSION-docker-image-aarch64.tar.gz"
+buildkite-agent artifact upload "kibana-$BASE_VERSION-cdn-assets.tar.gz"
 buildkite-agent artifact upload "dependencies-$GIT_ABBREV_COMMIT.csv"
 cd -
 

.buildkite/scripts/steps/artifacts/publish.sh

@@ -20,7 +20,7 @@ download "kibana-$FULL_VERSION-docker-image.tar.gz"
 download "kibana-$FULL_VERSION-docker-image-aarch64.tar.gz"
 download "kibana-cloud-$FULL_VERSION-docker-image.tar.gz"
 download "kibana-cloud-$FULL_VERSION-docker-image-aarch64.tar.gz"
-download "kibana-ubi8-$FULL_VERSION-docker-image.tar.gz"
+download "kibana-ubi-$FULL_VERSION-docker-image.tar.gz"
 
 download "kibana-$FULL_VERSION-arm64.deb"
 download "kibana-$FULL_VERSION-amd64.deb"
@@ -30,7 +30,7 @@ download "kibana-$FULL_VERSION-aarch64.rpm"
 download "kibana-$FULL_VERSION-docker-build-context.tar.gz"
 download "kibana-cloud-$FULL_VERSION-docker-build-context.tar.gz"
 download "kibana-ironbank-$FULL_VERSION-docker-build-context.tar.gz"
-download "kibana-ubi8-$FULL_VERSION-docker-build-context.tar.gz"
+download "kibana-ubi-$FULL_VERSION-docker-build-context.tar.gz"
 
 download "kibana-$FULL_VERSION-linux-aarch64.tar.gz"
 download "kibana-$FULL_VERSION-linux-x86_64.tar.gz"

.buildkite/scripts/steps/checks/yarn_deduplicate.sh

@@ -7,4 +7,4 @@ source .buildkite/scripts/common/util.sh
 echo "--- Check yarn.lock for duplicated modules"
 node scripts/yarn_deduplicate
 
-check_for_changed_files 'node scripts/yarn_deduplicate && yarn kbn bootstrap' false
+check_for_changed_files 'node scripts/yarn_deduplicate' false 'TO FIX: Run node '"'"'scripts/yarn_deduplicate && yarn kbn bootstrap'"'"' locally, or add an exception to src/dev/yarn_deduplicate/index.ts and then commit the changes and push to your branch'