Merge branch 'main' into younesmln-kibana-config-for-max-number-of-services-per-service-group

Author: younesmln

.backportrc.json

@@ -3,6 +3,7 @@
   "repoName": "kibana",
   "targetBranchChoices": [
     "main",
+    "8.3",
     "8.2",
     "8.1",
     "8.0",
@@ -39,7 +40,7 @@
     "backport"
   ],
   "branchLabelMapping": {
-    "^v8.3.0$": "main",
+    "^v8.4.0$": "main",
     "^v(\\d+).(\\d+).\\d+$": "$1.$2"
   },
   "autoMerge": true,

.buildkite/package-lock.json

@@ -3,6 +3,6 @@
   "version": "1.0.0",
   "private": true,
   "dependencies": {
-    "kibana-buildkite-library": "git+https://[email protected]/elastic/kibana-buildkite-library#ae4994aba5f2e72edcc5914e2aa208086e4b7ea3"
+    "kibana-buildkite-library": "git+https://[email protected]/elastic/kibana-buildkite-library#4ecaba35293fb635cf92ca205ee84fca52f19e2e"
   }
 }

.buildkite/package.json

@@ -53,6 +53,7 @@ steps:
 
   - command: KIBANA_DOCKER_CONTEXT=cloud .buildkite/scripts/steps/artifacts/docker_context.sh
     label: 'Docker Context Verification'
+    soft_fail: true
     agents:
       queue: n2-2
     timeout_in_minutes: 30
@@ -74,6 +75,7 @@ steps:
 
   - command: .buildkite/scripts/steps/artifacts/cloud.sh
     label: 'Cloud Deployment'
+    soft_fail: true
     agents:
       queue: n2-2
     timeout_in_minutes: 30

.buildkite/pipelines/artifacts.yml

@@ -0,0 +1,30 @@
+steps:
+  - command: .buildkite/scripts/lifecycle/pre_build.sh
+    label: Pre-Build
+    timeout_in_minutes: 10
+    agents:
+      queue: kibana-default
+
+  - wait
+
+  - command: .buildkite/scripts/steps/test/pick_test_group_run_order.sh
+    label: 'Pick Test Group Run Order'
+    agents:
+      queue: kibana-default
+    env:
+      FTR_CONFIGS_DEPS: ''
+      LIMIT_CONFIG_TYPE: 'unit,functional,integration'
+      JEST_UNIT_SCRIPT: '.buildkite/scripts/steps/code_coverage/jest.sh'
+      JEST_INTEGRATION_SCRIPT: '.buildkite/scripts/steps/code_coverage/jest_integration.sh'
+      FTR_CONFIGS_SCRIPT: '.buildkite/scripts/steps/code_coverage/ftr_configs.sh'
+
+  - command: .buildkite/scripts/steps/code_coverage/ingest.sh
+    label: 'Merge and Ingest'
+    agents:
+      queue: c2-16
+    depends_on:
+      - jest
+      - jest-integration
+      - ftr-configs
+    timeout_in_minutes: 30
+    key: ingest

.buildkite/pipelines/code_coverage/daily.yml

@@ -12,3 +12,7 @@ steps:
     command: .buildkite/scripts/steps/es_snapshots/promote.sh
     agents:
       queue: kibana-default
+  - wait
+  - trigger: kibana-agent-packer-cache
+    async: true
+    branches: main

.buildkite/pipelines/es_snapshots/promote.yml

@@ -18,6 +18,7 @@
       "skip_ci_labels": ["skip-ci", "jenkins-ci"],
       "skip_target_branches": ["6.8", "7.11", "7.12"],
       "skip_ci_on_only_changed": [
+        "^dev_docs/",
         "^docs/",
         "^rfcs/",
         "^.ci/.+\\.yml$",
@@ -26,6 +27,7 @@
         "^.ci/Jenkinsfile_[^/]+$",
         "^\\.github/",
         "\\.md$",
+        "\\.mdx$",
         "^\\.backportrc\\.json$",
         "^nav-kibana-dev\\.docnav\\.json$",
         "^src/dev/prs/kibana_qa_pr_list\\.json$",

.buildkite/pull_requests.json

@@ -7,6 +7,7 @@ export KIBANA_DIR
 export XPACK_DIR="$KIBANA_DIR/x-pack"
 
 export CACHE_DIR="$HOME/.kibana"
+export ES_CACHE_DIR="$HOME/.es-snapshot-cache"
 PARENT_DIR="$(cd "$KIBANA_DIR/.."; pwd)"
 export PARENT_DIR
 export WORKSPACE="${WORKSPACE:-$PARENT_DIR}"

.buildkite/scripts/common/env.sh

@@ -6,4 +6,10 @@ source .buildkite/scripts/common/util.sh
 source .buildkite/scripts/common/env.sh
 source .buildkite/scripts/common/setup_node.sh
 
+export FORCE_BOOTSTRAP_REMOTE_CACHE=true
+
 yarn kbn bootstrap
+
+for version in $(cat versions.json | jq -r '.versions[].version'); do
+  node scripts/es snapshot --download-only --base-path "$ES_CACHE_DIR" --version "$version"
+done

.buildkite/scripts/packer_cache.sh

@@ -6,12 +6,22 @@ set -euo pipefail
 
 source .buildkite/scripts/steps/artifacts/env.sh
 
-echo "--- Publish Cloud image"
+echo "--- Build and publish Cloud image"
 mkdir -p target
-cd target
 
-buildkite-agent artifact download "kibana-cloud-$FULL_VERSION-docker-image.tar.gz" . --build "${KIBANA_BUILD_ID:-$BUILDKITE_BUILD_ID}"
-docker load --input kibana-cloud-$FULL_VERSION-docker-image.tar.gz
+buildkite-agent artifact download "kibana-$FULL_VERSION-linux-x86_64.tar.gz" ./target --build "${KIBANA_BUILD_ID:-$BUILDKITE_BUILD_ID}"
+
+node scripts/build \
+  --skip-initialize \
+  --skip-generic-folders \
+  --skip-platform-folders \
+  --skip-archives \
+  --docker-images \
+  --skip-docker-ubi \
+  --skip-docker-ubuntu \
+  --skip-docker-contexts
+
+docker load --input target/kibana-cloud-$FULL_VERSION-docker-image.tar.gz
 
 TAG="$FULL_VERSION-$GIT_COMMIT"
 KIBANA_BASE_IMAGE="docker.elastic.co/kibana-ci/kibana-cloud:$FULL_VERSION"
@@ -25,8 +35,6 @@ trap 'docker logout docker.elastic.co' EXIT
 docker push "$KIBANA_TEST_IMAGE"
 docker logout docker.elastic.co
 
-cd -
-
 echo "--- Create deployment"
 CLOUD_DEPLOYMENT_NAME="kibana-artifacts-$TAG"