Merge branch 'main' into deprecate_csp_rule_remove_migration_object

.buildkite/ftr_configs.yml

@@ -262,6 +262,7 @@ enabled:
   - x-pack/test/security_api_integration/oidc.config.ts
   - x-pack/test/security_api_integration/pki.config.ts
   - x-pack/test/security_api_integration/saml.config.ts
+  - x-pack/test/security_api_integration/saml_cloud.config.ts
   - x-pack/test/security_api_integration/session_idle.config.ts
   - x-pack/test/security_api_integration/session_invalidate.config.ts
   - x-pack/test/security_api_integration/session_lifespan.config.ts

.buildkite/package.json

@@ -15,12 +15,12 @@
     "tslib": "*"
   },
   "devDependencies": {
-    "@types/chai": "^4.2.10",
+    "@types/chai": "^4.3.3",
     "@types/js-yaml": "^4.0.5",
     "@types/minimatch": "^3.0.5",
     "@types/mocha": "^10.0.1",
     "@types/node": "^15.12.2",
-    "chai": "^4.2.0",
+    "chai": "^4.3.6",
     "mocha": "^10.2.0",
     "nock": "^12.0.2",
     "ts-node": "^10.7.0",

.buildkite/pipelines/on_merge.yml

@@ -149,3 +149,11 @@ steps:
     timeout_in_minutes: 10
     agents:
       queue: kibana-default
+
+  - wait
+
+  - command: '.buildkite/scripts/steps/artifacts/docker_image_trigger.sh'
+    label: Trigger container image build
+    timeout_in_minutes: 10
+    agents:
+      queue: 'kibana-default'

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

@@ -9,16 +9,16 @@ source .buildkite/scripts/steps/artifacts/env.sh
 GIT_ABBREV_COMMIT=${BUILDKITE_COMMIT:0:7}
 KIBANA_IMAGE="docker.elastic.co/kibana-ci/kibana:$GIT_ABBREV_COMMIT"
 
-echo "--- Verify image does not already exist"
+echo "--- Verify manifest does not already exist"
 echo "$KIBANA_DOCKER_PASSWORD" | docker login -u "$KIBANA_DOCKER_USERNAME" --password-stdin docker.elastic.co
 trap 'docker logout docker.elastic.co' EXIT
 
 if docker manifest inspect $KIBANA_IMAGE &> /dev/null; then
-  echo "Image already exists, exiting"
+  echo "Manifest already exists, exiting"
   exit 1
 fi
 
-echo "--- Build image"
+echo "--- Build images"
 node scripts/build \
   --debug \
   --release \
@@ -29,6 +29,29 @@ node scripts/build \
   --skip-docker-ubi \
   --skip-docker-cloud \
   --skip-docker-contexts
+
+echo "--- Tag images"
+docker rmi "$KIBANA_IMAGE"
+docker load < "target/kibana-$BASE_VERSION-docker-image.tar.gz"
+docker tag "$KIBANA_IMAGE" "$KIBANA_IMAGE-amd64"
+
+docker rmi "$KIBANA_IMAGE"
+docker load < "target/kibana-$BASE_VERSION-docker-image-aarch64.tar.gz"
+docker tag "$KIBANA_IMAGE" "$KIBANA_IMAGE-arm64"
+
+echo "--- Push images"
+docker image push "$KIBANA_IMAGE-arm64"
+docker image push "$KIBANA_IMAGE-amd64"
+
+echo "--- Create manifest"
+docker rmi "$KIBANA_IMAGE"
+docker manifest create \
+  "$KIBANA_IMAGE" \
+  --amend "$KIBANA_IMAGE-arm64" \
+  --amend "$KIBANA_IMAGE-amd64"
+
+echo "--- Push manifest"
+docker manifest push "$KIBANA_IMAGE"
 docker logout docker.elastic.co
 
 echo "--- Build dependencies report"

.buildkite/scripts/steps/artifacts/docker_image_trigger.sh

@@ -0,0 +1,5 @@
+#!/bin/bash
+
+set -euo pipefail
+
+ts-node .buildkite/scripts/steps/trigger_pipeline.ts kibana-artifacts-container-image "$BUILDKITE_BRANCH" "$BUILDKITE_COMMIT"

.ci/Dockerfile

@@ -1,7 +1,7 @@
 # NOTE: This Dockerfile is ONLY used to run certain tasks in CI. It is not used to run Kibana or as a distributable.
 # If you're looking for the Kibana Docker image distributable, please see: src/dev/build/tasks/os_packages/docker_generator/templates/dockerfile.template.ts
 
-ARG NODE_VERSION=16.18.1
+ARG NODE_VERSION=18.13.0
 
 FROM node:${NODE_VERSION} AS base