Merge branch 'main' into Fleet_A11y_Tests

elastic · Jul 28, 2022 · 6b7f95e · 6b7f95e
2 parents 140d8f7 + bcbef78
commit 6b7f95e
Show file tree

Hide file tree

Showing 2,173 changed files with 94,465 additions and 64,644 deletions.
diff --git a/.backportrc.json b/.backportrc.json
@@ -3,6 +3,7 @@
   "repoName": "kibana",
   "targetBranchChoices": [
     "main",
+    "8.4",
     "8.3",
     "8.2",
     "8.1",
@@ -40,7 +41,7 @@
     "backport"
   ],
   "branchLabelMapping": {
-    "^v8.4.0$": "main",
+    "^v8.5.0$": "main",
     "^v(\\d+).(\\d+).\\d+$": "$1.$2"
   },
   "autoMerge": true,

diff --git a/.buildkite/ftr_configs.yml b/.buildkite/ftr_configs.yml
@@ -98,7 +98,6 @@ enabled:
   - test/interactive_setup_functional/manual_configuration_without_tls.config.ts
   - test/interactive_setup_functional/manual_configuration.config.ts
   - test/interpreter_functional/config.ts
-  - test/new_visualize_flow/config.ts
   - test/node_roles_functional/all.config.ts
   - test/node_roles_functional/background_tasks.config.ts
   - test/node_roles_functional/ui.config.ts

diff --git a/.buildkite/pipeline-utils/ci-stats/client.ts b/.buildkite/pipeline-utils/ci-stats/client.ts
@@ -132,11 +132,13 @@ export class CiStatsClient {
     });
   };
 
-  getPrReport = async (buildId: string) => {
+  getPrReport = async (buildId: string, backfillJobIds: string[] = []) => {
     const resp = await this.request<CiStatsPrReport>({
-      path: `v2/pr_report`,
-      params: {
+      path: `v3/pr_report`,
+      method: 'post',
+      body: {
         buildId,
+        backfillJobIds,
       },
     });
 

diff --git a/.buildkite/scripts/steps/es_snapshots/build.sh b/.buildkite/scripts/steps/es_snapshots/build.sh
@@ -14,10 +14,6 @@ mkdir -p "$destination"
 mkdir -p elasticsearch && cd elasticsearch
 
 export ELASTICSEARCH_BRANCH="${ELASTICSEARCH_BRANCH:-$BUILDKITE_BRANCH}"
-# Until ES renames their master branch to main...
-if [[ "$ELASTICSEARCH_BRANCH" == "main" ]]; then
-  export ELASTICSEARCH_BRANCH="master"
-fi
 
 if [[ ! -d .git ]]; then
   git init