Merge branch 'main' into discover-set-app-context

.buildkite/ftr_configs.yml

@@ -115,9 +115,15 @@ enabled:
   - test/functional/apps/discover/classic/config.ts
   - test/functional/apps/discover/embeddable/config.ts
   - test/functional/apps/discover/group1/config.ts
-  - test/functional/apps/discover/group2/config.ts
+  - test/functional/apps/discover/group2_data_grid1/config.ts
+  - test/functional/apps/discover/group2_data_grid2/config.ts
+  - test/functional/apps/discover/group2_data_grid3/config.ts
   - test/functional/apps/discover/group3/config.ts
   - test/functional/apps/discover/group4/config.ts
+  - test/functional/apps/discover/group5/config.ts
+  - test/functional/apps/discover/group6/config.ts
+  - test/functional/apps/discover/group7/config.ts
+  - test/functional/apps/discover/group8/config.ts
   - test/functional/apps/getting_started/config.ts
   - test/functional/apps/home/config.ts
   - test/functional/apps/kibana_overview/config.ts

.buildkite/pipeline-resource-definitions/kibana-purge-cloud-deployments.yml

@@ -34,6 +34,11 @@ spec:
         build_tags: false
         prefix_pull_request_fork_branch_names: false
         skip_pull_request_builds_for_existing_commits: true
+      schedules:
+        Purge cloud deployments (hourly):
+          cronline: 0 * * * * America/New_York
+          branch: main
+          message: 'Purge cloud deployments'
       teams:
         kibana-operations:
           access_level: MANAGE_BUILD_AND_READ

.buildkite/pipelines/artifacts_container_image.yml

@@ -2,9 +2,5 @@ steps:
   - command: .buildkite/scripts/steps/artifacts/docker_image.sh
     label: Build serverless container images
     agents:
-      queue: n2-16-spot
+      queue: c2-16
     timeout_in_minutes: 60
-    retry:
-      automatic:
-        - exit_status: '-1'
-          limit: 3