title BWC fix for 7.16

.bazelrc.common

@@ -132,6 +132,9 @@ coverage --instrument_test_targets
 # Metadata settings
 build --workspace_status_command="node ./src/dev/bazel_workspace_status.js"
 
+# Load remote cache settings, if they exist
+try-import %workspace%/.bazelrc.cache
+
 # Load any settings specific to the current user.
 # .bazelrc.user should appear in .gitignore so that settings are not shared with team members
 # This needs to be last statement in this

.buildkite/pipelines/bazel_cache.yml

@@ -1,5 +1,7 @@
 steps:
   - label: ':pipeline: Create pipeline with priority'
+    agents:
+      queue: kibana-default
     concurrency_group: bazel_macos
     concurrency: 1
     concurrency_method: eager

.buildkite/pipelines/docker_context.yml

@@ -0,0 +1,11 @@
+ steps:
+  - command: .buildkite/scripts/steps/docker_context/build.sh
+    label: 'Docker Build Context'
+    agents:
+      queue: n2-4
+    timeout_in_minutes: 30
+    key: build-docker-context
+    retry:
+      automatic:
+        - exit_status: '*'
+          limit: 1

.buildkite/pipelines/es_forward.yml

@@ -0,0 +1,82 @@
+steps:
+  - command: .buildkite/scripts/lifecycle/pre_build.sh
+    label: Pre-Build
+    timeout_in_minutes: 10
+    agents:
+      queue: kibana-default
+
+  - wait
+
+  - command: .buildkite/scripts/steps/build_kibana.sh
+    label: Build Kibana Distribution and Plugins
+    agents:
+      queue: c2-16
+    key: build
+    if: "build.env('KIBANA_BUILD_ID') == null || build.env('KIBANA_BUILD_ID') == ''"
+    timeout_in_minutes: 60
+
+  - command: .buildkite/scripts/steps/functional/xpack_cigroup.sh
+    label: 'Default CI Group'
+    parallelism: 27
+    agents:
+      queue: n2-4
+    depends_on: build
+    timeout_in_minutes: 150
+    key: default-cigroup
+    retry:
+      automatic:
+        - exit_status: '*'
+          limit: 1
+
+  - command: CI_GROUP=Docker .buildkite/scripts/steps/functional/xpack_cigroup.sh
+    label: 'Docker CI Group'
+    agents:
+      queue: n2-4
+    depends_on: build
+    timeout_in_minutes: 120
+    key: default-cigroup-docker
+    retry:
+      automatic:
+        - exit_status: '*'
+          limit: 1
+
+  - command: .buildkite/scripts/steps/functional/oss_cigroup.sh
+    label: 'OSS CI Group'
+    parallelism: 11
+    agents:
+      queue: n2-4
+    depends_on: build
+    timeout_in_minutes: 120
+    key: oss-cigroup
+    retry:
+      automatic:
+        - exit_status: '*'
+          limit: 1
+
+  - command: .buildkite/scripts/steps/test/jest_integration.sh
+    label: 'Jest Integration Tests'
+    parallelism: 3
+    agents:
+      queue: n2-4
+    timeout_in_minutes: 120
+    key: jest-integration
+    retry:
+      automatic:
+        - exit_status: '*'
+          limit: 1
+
+  - command: .buildkite/scripts/steps/test/api_integration.sh
+    label: 'API Integration Tests'
+    agents:
+      queue: n2-2
+    timeout_in_minutes: 120
+    key: api-integration
+
+  - wait: ~
+    continue_on_failure: true
+
+  - command: .buildkite/scripts/lifecycle/post_build.sh
+    label: Post-Build
+    timeout_in_minutes: 10
+    agents:
+      queue: kibana-default

.buildkite/pipelines/es_snapshots/promote.yml

@@ -10,3 +10,5 @@ steps:
         required: true
   - label: Promote Snapshot
     command: .buildkite/scripts/steps/es_snapshots/promote.sh
+    agents:
+      queue: kibana-default

.buildkite/pipelines/es_snapshots/verify.yml

@@ -14,6 +14,8 @@ steps:
   - command: .buildkite/scripts/lifecycle/pre_build.sh
     label: Pre-Build
     timeout_in_minutes: 10
+    agents:
+      queue: kibana-default
 
   - wait
 
@@ -65,6 +67,7 @@ steps:
 
   - command: .buildkite/scripts/steps/test/jest_integration.sh
     label: 'Jest Integration Tests'
+    parallelism: 3
     agents:
       queue: n2-4
     timeout_in_minutes: 120
@@ -84,6 +87,8 @@ steps:
   - command: .buildkite/scripts/steps/es_snapshots/trigger_promote.sh
     label: Trigger promotion
     timeout_in_minutes: 10
+    agents:
+      queue: kibana-default
     depends_on:
       - default-cigroup
       - default-cigroup-docker
@@ -97,3 +102,5 @@ steps:
   - command: .buildkite/scripts/lifecycle/post_build.sh
     label: Post-Build
     timeout_in_minutes: 10
+    agents:
+      queue: kibana-default

.buildkite/pipelines/flaky_tests/pipeline.js

@@ -1,6 +1,14 @@
-const groups = /** @type {Array<{key: string, name: string, ciGroups: number }>} */(
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0 and the Server Side Public License, v 1; you may not use this file except
+ * in compliance with, at your election, the Elastic License 2.0 or the Server
+ * Side Public License, v 1.
+ */
+
+const groups = /** @type {Array<{key: string, name: string, ciGroups: number }>} */ (
   require('./groups.json').groups
-)
+);
 
 const stepInput = (key, nameOfSuite) => {
   return {
@@ -22,10 +30,10 @@ const inputs = [
 
 for (const group of groups) {
   if (!group.ciGroups) {
-    inputs.push(stepInput(group.key, group.name))
+    inputs.push(stepInput(group.key, group.name));
   } else {
     for (let i = 1; i <= group.ciGroups; i++) {
-      inputs.push(stepInput(`${group.key}/${i}`, `${group.name} ${i}`))
+      inputs.push(stepInput(`${group.key}/${i}`, `${group.name} ${i}`));
     }
   }
 }
@@ -35,14 +43,17 @@ const pipeline = {
     {
       input: 'Number of Runs - Click Me',
       fields: inputs,
-      if: `build.env('KIBANA_FLAKY_TEST_RUNNER_CONFIG') == null`
+      if: `build.env('KIBANA_FLAKY_TEST_RUNNER_CONFIG') == null`,
     },
     {
       wait: '~',
     },
     {
       command: '.buildkite/pipelines/flaky_tests/runner.sh',
       label: 'Create pipeline',
+      agents: {
+        queue: 'kibana-default',
+      },
     },
   ],
 };

.buildkite/pipelines/flaky_tests/runner.js

@@ -1,3 +1,11 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0 and the Server Side Public License, v 1; you may not use this file except
+ * in compliance with, at your election, the Elastic License 2.0 or the Server
+ * Side Public License, v 1.
+ */
+
 const { execSync } = require('child_process');
 
 const concurrency = 25;
@@ -10,7 +18,9 @@ function getTestSuitesFromMetadata() {
     .split('\n')
     .filter((k) => k.startsWith('ftsr-suite/'));
 
-  const overrideCount = execSync(`buildkite-agent meta-data get 'ftsr-override-count'`).toString().trim();
+  const overrideCount = execSync(`buildkite-agent meta-data get 'ftsr-override-count'`)
+    .toString()
+    .trim();
 
   const testSuites = [];
   for (const key of keys) {
@@ -19,66 +29,66 @@ function getTestSuitesFromMetadata() {
     }
 
     const value =
-      overrideCount || execSync(`buildkite-agent meta-data get '${key}'`).toString().trim();
+      overrideCount && overrideCount !== '0'
+        ? overrideCount
+        : execSync(`buildkite-agent meta-data get '${key}'`).toString().trim();
 
     const count = value === '' ? defaultCount : parseInt(value);
-    totalJobs += count;
-
     testSuites.push({
       key: key.replace('ftsr-suite/', ''),
       count: count,
     });
   }
 
-  return testSuites
+  return testSuites;
 }
 
 function getTestSuitesFromJson(json) {
   const fail = (errorMsg) => {
-    console.error('+++ Invalid test config provided')
+    console.error('+++ Invalid test config provided');
     console.error(`${errorMsg}: ${json}`);
     process.exit(1);
-  }
+  };
 
   let parsed;
   try {
-    parsed = JSON.parse(json)
+    parsed = JSON.parse(json);
   } catch (error) {
-    fail(`JSON test config did not parse correctly`)
+    fail(`JSON test config did not parse correctly`);
   }
 
   if (!Array.isArray(parsed)) {
-    fail(`JSON test config must be an array`)
+    fail(`JSON test config must be an array`);
   }
 
   /** @type {Array<{ key: string, count: number }>} */
-  const testSuites = []
+  const testSuites = [];
   for (const item of parsed) {
     if (typeof item !== 'object' || item === null) {
-      fail(`testSuites must be objects`)
+      fail(`testSuites must be objects`);
     }
-    const key = item.key
+    const key = item.key;
     if (typeof key !== 'string') {
-      fail(`testSuite.key must be a string`)
+      fail(`testSuite.key must be a string`);
     }
     const count = item.count;
     if (typeof count !== 'number') {
-      fail(`testSuite.count must be a number`)
+      fail(`testSuite.count must be a number`);
     }
     testSuites.push({
       key,
       count,
-    })
+    });
   }
 
-  return testSuites
+  return testSuites;
 }
 
 const testSuites = process.env.KIBANA_FLAKY_TEST_RUNNER_CONFIG
   ? getTestSuitesFromJson(process.env.KIBANA_FLAKY_TEST_RUNNER_CONFIG)
   : getTestSuitesFromMetadata();
 
-let totalJobs = testSuites.reduce((acc, t) => acc + t.count, initialJobs);
+const totalJobs = testSuites.reduce((acc, t) => acc + t.count, initialJobs);
 
 if (totalJobs > 500) {
   console.error('+++ Too many tests');
@@ -103,7 +113,7 @@ steps.push({
   label: 'Build Kibana Distribution and Plugins',
   agents: { queue: 'c2-8' },
   key: 'build',
-  if: "build.env('BUILD_ID_FOR_ARTIFACTS') == null || build.env('BUILD_ID_FOR_ARTIFACTS') == ''",
+  if: "build.env('KIBANA_BUILD_ID') == null || build.env('KIBANA_BUILD_ID') == ''",
 });
 
 for (const testSuite of testSuites) {