Merge branch 'main' into de-8-13/enable-additional-connectors

elastic · May 9, 2024 · 779da0c · 779da0c
2 parents 51ef016 + cc21a1a
commit 779da0c
Show file tree

Hide file tree

Showing 32,275 changed files with 1,489,750 additions and 1,201,011 deletions.
diff --git a/.backportrc.json b/.backportrc.json
@@ -3,6 +3,8 @@
   "repoName": "kibana",
   "targetBranchChoices": [
     "main",
+    "8.14",
+    "8.13",
     "8.12",
     "8.11",
     "8.10",
@@ -49,7 +51,7 @@
     "backport"
   ],
   "branchLabelMapping": {
-    "^v8.13.0$": "main",
+    "^v8.15.0$": "main",
     "^v(\\d+).(\\d+).\\d+$": "$1.$2"
   },
   "autoMerge": true,

diff --git a/.bazelignore b/.bazelignore
@@ -3,7 +3,6 @@
 # https://github.com/bazelbuild/bazel/issues/7093
 # https://github.com/bazelbuild/bazel/issues/8106
 .buildkite
-.ci
 .chromium
 .git
 .github

diff --git a/.buildkite/disabled_jest_configs.json b/.buildkite/disabled_jest_configs.json
@@ -1,3 +1 @@
-[
-  "x-pack/plugins/index_management/jest.config.js"
-]
+[]
diff --git a/.buildkite/ftr_configs.yml b/.buildkite/ftr_configs.yml
diff --git a/.buildkite/hooks/post-command b/.buildkite/hooks/post-command
@@ -1,7 +1,3 @@
 #!/usr/bin/env bash
 
-if [[ "$BUILDKITE_AGENT_NAME" =~ ^bk-agent ]]; then
-  echo "Pipeline file triggered from outside the kibana executors, skipping post_command"
-else
-  .buildkite/scripts/lifecycle/post_command.sh
-fi
+source .buildkite/scripts/lifecycle/post_command.sh
diff --git a/.buildkite/hooks/pre-command b/.buildkite/hooks/pre-command
@@ -1,7 +1,3 @@
 #!/usr/bin/env bash
 
-if [[ "$BUILDKITE_AGENT_NAME" =~ ^bk-agent ]]; then
-  echo "Pipeline file triggered from outside the kibana executors, skipping pre_command"
-else
-  source .buildkite/scripts/lifecycle/pre_command.sh
-fi
+source .buildkite/scripts/lifecycle/pre_command.sh