Merge branch 'main' into task/serverless-data-usage-API-192965

elastic · Oct 8, 2024 · d1a4128 · d1a4128
2 parents 3b39d20 + a819d65
commit d1a4128
Show file tree

Hide file tree

Showing 1,076 changed files with 5,850 additions and 8,565 deletions.
diff --git a/.buildkite/pipeline-resource-definitions/kibana-chrome-forward-testing.yml b/.buildkite/pipeline-resource-definitions/kibana-chrome-forward-testing.yml
@@ -19,18 +19,14 @@ spec:
       description: 'Testing Kibana against upcoming versions of Chrome'
     spec:
       env:
-        # This is what will switch the FTRs pipeline to use Chrome Beta
-        USE_CHROME_BETA: 'true'
-        # Unit-tests don't depend on Chrome's versions, integration tests , so we don't need to run those
-        LIMIT_CONFIG_TYPE: 'functional'
         SLACK_NOTIFICATIONS_CHANNEL: '#kibana-operations-alerts'
         ELASTIC_SLACK_NOTIFICATIONS_ENABLED: 'true'
 
       allow_rebuilds: true
       branch_configuration: main
       default_branch: main
       repository: elastic/kibana
-      pipeline_file: .buildkite/scripts/pipelines/pull_request/pipeline.sh
+      pipeline_file: .buildkite/pipelines/chrome_forward_testing.yml
       skip_intermediate_builds: true
       provider_settings:
         prefix_pull_request_fork_branch_names: false

diff --git a/.buildkite/pipeline-resource-definitions/kibana-es-forward-testing.yml b/.buildkite/pipeline-resource-definitions/kibana-es-forward-testing.yml
@@ -21,6 +21,7 @@ spec:
       env:
         SLACK_NOTIFICATIONS_CHANNEL: '#kibana-operations-alerts'
         ELASTIC_SLACK_NOTIFICATIONS_ENABLED: 'true'
+        REPORT_FAILED_TESTS_TO_GITHUB: 'true'
       allow_rebuilds: false
       branch_configuration: main
       default_branch: main

diff --git a/.buildkite/pipeline-resource-definitions/kibana-migration-staging.yml b/.buildkite/pipeline-resource-definitions/kibana-migration-staging.yml
@@ -15,7 +15,7 @@ spec:
       description: Kibana / Pipeline migration staging
     spec:
       env:
-        SLACK_NOTIFICATIONS_ENABLED: 'false'
+        ELASTIC_SLACK_NOTIFICATIONS_ENABLED: 'false'
       repository: elastic/kibana
       pipeline_file: .buildkite/pipelines/upload_pipeline.yml
       provider_settings:

diff --git a/.buildkite/pipeline-resource-definitions/kibana-on-merge.yml b/.buildkite/pipeline-resource-definitions/kibana-on-merge.yml
@@ -20,7 +20,7 @@ spec:
     spec:
       env:
         SLACK_NOTIFICATIONS_CHANNEL: '#kibana-operations-alerts'
-        GITHUB_BUILD_COMMIT_STATUS_ENABLED: 'true'
+        ELASTIC_GITHUB_BUILD_COMMIT_STATUS_ENABLED: 'true'
         GITHUB_COMMIT_STATUS_CONTEXT: buildkite/on-merge
         REPORT_FAILED_TESTS_TO_GITHUB: 'true'
         ELASTIC_SLACK_NOTIFICATIONS_ENABLED: 'true'

diff --git a/.buildkite/pipeline-resource-definitions/kibana-pr.yml b/.buildkite/pipeline-resource-definitions/kibana-pr.yml
@@ -19,10 +19,10 @@ spec:
       description: Runs manually for pull requests
     spec:
       env:
-        PR_COMMENTS_ENABLED: 'true'
-        GITHUB_BUILD_COMMIT_STATUS_ENABLED: 'true'
+        ELASTIC_PR_COMMENTS_ENABLED: 'true'
+        ELASTIC_GITHUB_BUILD_COMMIT_STATUS_ENABLED: 'true'
+        ELASTIC_GITHUB_STEP_COMMIT_STATUS_ENABLED: 'true'
         GITHUB_BUILD_COMMIT_STATUS_CONTEXT: kibana-ci
-        GITHUB_STEP_COMMIT_STATUS_ENABLED: 'true'
       allow_rebuilds: true
       branch_configuration: ''
       cancel_intermediate_builds: true

diff --git a/.buildkite/pipeline-utils/test-failures/annotate.ts b/.buildkite/pipeline-utils/test-failures/annotate.ts
@@ -171,7 +171,10 @@ export const annotateTestFailures = async () => {
 
   buildkite.setAnnotation('test_failures', 'error', getAnnotation(failures, failureHtmlArtifacts));
 
-  if (process.env.PR_COMMENTS_ENABLED === 'true') {
+  if (
+    process.env.PR_COMMENTS_ENABLED === 'true' ||
+    process.env.ELASTIC_PR_COMMENTS_ENABLED === 'true'
+  ) {
     buildkite.setMetadata(
       'pr_comment:test_failures:body',
       getPrComment(failures, failureHtmlArtifacts)