Merge branch 'main' into feature-fix-change-space-update-query

elastic · Oct 30, 2024 · cf6d260 · cf6d260
2 parents 2067407 + e3c0807
commit cf6d260
Show file tree

Hide file tree

Showing 1,329 changed files with 10,179 additions and 12,275 deletions.
diff --git a/.buildkite/pipeline-resource-definitions/kibana-deploy-project.yml b/.buildkite/pipeline-resource-definitions/kibana-deploy-project.yml
@@ -28,9 +28,11 @@ spec:
       pipeline_file: .buildkite/pipelines/serverless_deployment/project-build-and-deploy-pr.yml
       skip_intermediate_builds: true
       provider_settings:
+        build_pull_requests: true
         prefix_pull_request_fork_branch_names: false
         skip_pull_request_builds_for_existing_commits: true
         trigger_mode: none
+      cancel_intermediate_builds: true
       teams:
         kibana-operations:
           access_level: MANAGE_BUILD_AND_READ

diff --git a/.buildkite/pipeline-utils/github/github.ts b/.buildkite/pipeline-utils/github/github.ts
@@ -93,6 +93,26 @@ export const doAnyChangesMatch = async (
   return anyFilesMatchRequired;
 };
 
+export function addComment(
+  comment: string,
+  owner = process.env.GITHUB_PR_BASE_OWNER,
+  repo = process.env.GITHUB_PR_BASE_REPO,
+  prNumber: undefined | string | number = process.env.GITHUB_PR_NUMBER
+) {
+  if (!owner || !repo || !prNumber) {
+    throw Error(
+      "Couldn't retrieve Github PR info from environment variables in order to add a comment"
+    );
+  }
+
+  return github.issues.createComment({
+    owner,
+    repo,
+    issue_number: typeof prNumber === 'number' ? prNumber : parseInt(prNumber, 10),
+    body: comment,
+  });
+}
+
 export function getGithubClient() {
   return github;
 }
diff --git a/.buildkite/pipelines/on_merge.yml b/.buildkite/pipelines/on_merge.yml
@@ -46,6 +46,36 @@ steps:
         - exit_status: '-1'
           limit: 3
 
+  - command: .buildkite/scripts/steps/lint.sh
+    label: 'Linting'
+    agents:
+      image: family/kibana-ubuntu-2004
+      imageProject: elastic-images-prod
+      provider: gcp
+      machineType: n2-standard-16
+      preemptible: true
+    key: linting
+    timeout_in_minutes: 60
+    retry:
+      automatic:
+        - exit_status: '-1'
+          limit: 3
+
+  - command: .buildkite/scripts/steps/lint_with_types.sh
+    label: 'Linting (with types)'
+    agents:
+      image: family/kibana-ubuntu-2004
+      imageProject: elastic-images-prod
+      provider: gcp
+      machineType: n2-standard-32
+      preemptible: true
+    key: linting_with_types
+    timeout_in_minutes: 90
+    retry:
+      automatic:
+        - exit_status: '-1'
+          limit: 3
+
   - wait
 
   - command: .buildkite/scripts/steps/on_merge_api_docs.sh
@@ -109,6 +139,8 @@ steps:
     depends_on:
       - build
       - quick_checks
+      - linting
+      - linting_with_types
     timeout_in_minutes: 60
     parallelism: 3
     retry:
@@ -127,6 +159,8 @@ steps:
     depends_on:
       - build
       - quick_checks
+      - linting
+      - linting_with_types
     timeout_in_minutes: 60
     parallelism: 2
     retry:
@@ -145,6 +179,8 @@ steps:
     depends_on:
       - build
       - quick_checks
+      - linting
+      - linting_with_types
     timeout_in_minutes: 60
     parallelism: 8
     retry:
@@ -163,6 +199,8 @@ steps:
     depends_on:
       - build
       - quick_checks
+      - linting
+      - linting_with_types
     timeout_in_minutes: 60
     parallelism: 5
     retry:
@@ -181,6 +219,8 @@ steps:
     depends_on:
       - build
       - quick_checks
+      - linting
+      - linting_with_types
     timeout_in_minutes: 60
     parallelism: 1
     retry:
@@ -199,6 +239,8 @@ steps:
     depends_on:
       - build
       - quick_checks
+      - linting
+      - linting_with_types
     timeout_in_minutes: 60
     parallelism: 4
     retry:
@@ -217,6 +259,8 @@ steps:
     depends_on:
       - build
       - quick_checks
+      - linting
+      - linting_with_types
     timeout_in_minutes: 60
     parallelism: 6
     retry:
@@ -235,6 +279,8 @@ steps:
     depends_on:
       - build
       - quick_checks
+      - linting
+      - linting_with_types
     timeout_in_minutes: 60
     parallelism: 5
     retry:
@@ -253,6 +299,8 @@ steps:
     depends_on:
       - build
       - quick_checks
+      - linting
+      - linting_with_types
     timeout_in_minutes: 60
     parallelism: 6
     retry:
@@ -271,6 +319,8 @@ steps:
     depends_on:
       - build
       - quick_checks
+      - linting
+      - linting_with_types
     timeout_in_minutes: 60
     parallelism: 5
     retry:
@@ -289,6 +339,8 @@ steps:
     depends_on:
       - build
       - quick_checks
+      - linting
+      - linting_with_types
     timeout_in_minutes: 60
     parallelism: 6
     retry:
@@ -307,6 +359,8 @@ steps:
     depends_on:
       - build
       - quick_checks
+      - linting
+      - linting_with_types
     timeout_in_minutes: 60
     parallelism: 1
     retry:
@@ -325,6 +379,8 @@ steps:
     depends_on:
       - build
       - quick_checks
+      - linting
+      - linting_with_types
     timeout_in_minutes: 60
     parallelism: 1
     retry:
@@ -343,6 +399,8 @@ steps:
     depends_on:
       - build
       - quick_checks
+      - linting
+      - linting_with_types
     timeout_in_minutes: 60
     parallelism: 2
     retry:
@@ -361,6 +419,8 @@ steps:
     depends_on:
       - build
       - quick_checks
+      - linting
+      - linting_with_types
     timeout_in_minutes: 60
     parallelism: 2
     retry:
@@ -379,6 +439,8 @@ steps:
     depends_on:
       - build
       - quick_checks
+      - linting
+      - linting_with_types
     timeout_in_minutes: 60
     parallelism: 6
     retry:
@@ -397,6 +459,8 @@ steps:
     depends_on:
       - build
       - quick_checks
+      - linting
+      - linting_with_types
     timeout_in_minutes: 60
     parallelism: 8
     retry:
@@ -415,6 +479,8 @@ steps:
     depends_on:
       - build
       - quick_checks
+      - linting
+      - linting_with_types
     timeout_in_minutes: 60
     parallelism: 8
     retry:
@@ -435,6 +501,8 @@ steps:
     depends_on:
       - build
       - quick_checks
+      - linting
+      - linting_with_types
     timeout_in_minutes: 60
     parallelism: 20
     retry:
@@ -455,6 +523,8 @@ steps:
     depends_on:
       - build
       - quick_checks
+      - linting
+      - linting_with_types
     timeout_in_minutes: 60
     parallelism: 14
     retry:
@@ -468,42 +538,14 @@ steps:
     depends_on:
       - build
       - quick_checks
+      - linting
+      - linting_with_types
     agents:
       image: family/kibana-ubuntu-2004
       imageProject: elastic-images-prod
       provider: gcp
       machineType: n2-standard-2
 
-  - command: .buildkite/scripts/steps/lint.sh
-    label: 'Linting'
-    agents:
-      image: family/kibana-ubuntu-2004
-      imageProject: elastic-images-prod
-      provider: gcp
-      machineType: n2-standard-8
-      preemptible: true
-    key: linting
-    timeout_in_minutes: 60
-    retry:
-      automatic:
-        - exit_status: '-1'
-          limit: 3
-
-  - command: .buildkite/scripts/steps/lint_with_types.sh
-    label: 'Linting (with types)'
-    agents:
-      image: family/kibana-ubuntu-2004
-      imageProject: elastic-images-prod
-      provider: gcp
-      machineType: n2-standard-16
-      preemptible: true
-    key: linting_with_types
-    timeout_in_minutes: 90
-    retry:
-      automatic:
-        - exit_status: '-1'
-          limit: 3
-
   - command: .buildkite/scripts/steps/checks.sh
     label: 'Checks'
     agents:

diff --git a/.buildkite/pipelines/pull_request/apm_cypress.yml b/.buildkite/pipelines/pull_request/apm_cypress.yml
@@ -7,6 +7,8 @@ steps:
     depends_on:
       - build
       - quick_checks
+      - linting
+      - linting_with_types
     timeout_in_minutes: 120
     parallelism: 1 # TODO: Set parallelism when apm_cypress handles it
     retry:

diff --git a/.buildkite/pipelines/pull_request/base.yml b/.buildkite/pipelines/pull_request/base.yml
@@ -32,6 +32,30 @@ steps:
         - exit_status: '-1'
           limit: 3
 
+  - command: .buildkite/scripts/steps/lint.sh
+    label: 'Linting'
+    agents:
+      machineType: n2-standard-16
+      preemptible: true
+    key: linting
+    timeout_in_minutes: 60
+    retry:
+      automatic:
+        - exit_status: '-1'
+          limit: 3
+
+  - command: .buildkite/scripts/steps/lint_with_types.sh
+    label: 'Linting (with types)'
+    agents:
+      machineType: n2-standard-32
+      preemptible: true
+    key: linting_with_types
+    timeout_in_minutes: 90
+    retry:
+      automatic:
+        - exit_status: '-1'
+          limit: 3
+
   - wait
 
   - command: .buildkite/scripts/steps/ci_stats_ready.sh
@@ -61,18 +85,6 @@ steps:
         - exit_status: '*'
           limit: 1
 
-  - command: .buildkite/scripts/steps/lint.sh
-    label: 'Linting'
-    agents:
-      machineType: n2-standard-8
-      preemptible: true
-    key: linting
-    timeout_in_minutes: 60
-    retry:
-      automatic:
-        - exit_status: '-1'
-          limit: 3
-
   - command: .buildkite/scripts/steps/check_types.sh
     label: 'Check Types'
     agents:
@@ -85,18 +97,6 @@ steps:
         - exit_status: '-1'
           limit: 3
 
-  - command: .buildkite/scripts/steps/lint_with_types.sh
-    label: 'Linting (with types)'
-    agents:
-      machineType: n2-standard-16
-      preemptible: true
-    key: linting_with_types
-    timeout_in_minutes: 90
-    retry:
-      automatic:
-        - exit_status: '-1'
-          limit: 3
-
   - command: .buildkite/scripts/steps/checks.sh
     label: 'Checks'
     key: checks

diff --git a/.buildkite/pipelines/pull_request/deploy_cloud.yml b/.buildkite/pipelines/pull_request/deploy_cloud.yml
@@ -7,6 +7,8 @@ steps:
     depends_on:
       - build
       - quick_checks
+      - linting
+      - linting_with_types
     timeout_in_minutes: 30
     soft_fail: true
     retry:

diff --git a/.buildkite/pipelines/pull_request/exploratory_view_plugin.yml b/.buildkite/pipelines/pull_request/exploratory_view_plugin.yml
@@ -7,6 +7,8 @@ steps:
     depends_on:
       - build
       - quick_checks
+      - linting
+      - linting_with_types
     timeout_in_minutes: 60
     artifact_paths:
       - 'x-pack/plugins/observability_solution/exploratory_view/e2e/.journeys/**/*'