Skip to content

Commit d1a4128

Browse files
ashokadityaashokaditya
authored
Merge branch 'main' into task/serverless-data-usage-API-192965
2 parents 3b39d20 + a819d65 commit d1a4128

1,076 files changed

Lines changed: 5850 additions & 8565 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎.buildkite/pipeline-resource-definitions/kibana-chrome-forward-testing.yml‎

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -19,18 +19,14 @@ spec:
1919
description: 'Testing Kibana against upcoming versions of Chrome'
2020
spec:
2121
env:
22-
# This is what will switch the FTRs pipeline to use Chrome Beta
23-
USE_CHROME_BETA: 'true'
24-
# Unit-tests don't depend on Chrome's versions, integration tests , so we don't need to run those
25-
LIMIT_CONFIG_TYPE: 'functional'
2622
SLACK_NOTIFICATIONS_CHANNEL: '#kibana-operations-alerts'
2723
ELASTIC_SLACK_NOTIFICATIONS_ENABLED: 'true'
2824

2925
allow_rebuilds: true
3026
branch_configuration: main
3127
default_branch: main
3228
repository: elastic/kibana
33-
pipeline_file: .buildkite/scripts/pipelines/pull_request/pipeline.sh
29+
pipeline_file: .buildkite/pipelines/chrome_forward_testing.yml
3430
skip_intermediate_builds: true
3531
provider_settings:
3632
prefix_pull_request_fork_branch_names: false

‎.buildkite/pipeline-resource-definitions/kibana-es-forward-testing.yml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@ spec:
2121
env:
2222
SLACK_NOTIFICATIONS_CHANNEL: '#kibana-operations-alerts'
2323
ELASTIC_SLACK_NOTIFICATIONS_ENABLED: 'true'
24+
REPORT_FAILED_TESTS_TO_GITHUB: 'true'
2425
allow_rebuilds: false
2526
branch_configuration: main
2627
default_branch: main

‎.buildkite/pipeline-resource-definitions/kibana-migration-staging.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ spec:
1515
description: Kibana / Pipeline migration staging
1616
spec:
1717
env:
18-
SLACK_NOTIFICATIONS_ENABLED: 'false'
18+
ELASTIC_SLACK_NOTIFICATIONS_ENABLED: 'false'
1919
repository: elastic/kibana
2020
pipeline_file: .buildkite/pipelines/upload_pipeline.yml
2121
provider_settings:

‎.buildkite/pipeline-resource-definitions/kibana-on-merge.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ spec:
2020
spec:
2121
env:
2222
SLACK_NOTIFICATIONS_CHANNEL: '#kibana-operations-alerts'
23-
GITHUB_BUILD_COMMIT_STATUS_ENABLED: 'true'
23+
ELASTIC_GITHUB_BUILD_COMMIT_STATUS_ENABLED: 'true'
2424
GITHUB_COMMIT_STATUS_CONTEXT: buildkite/on-merge
2525
REPORT_FAILED_TESTS_TO_GITHUB: 'true'
2626
ELASTIC_SLACK_NOTIFICATIONS_ENABLED: 'true'

‎.buildkite/pipeline-resource-definitions/kibana-pr.yml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,10 +19,10 @@ spec:
1919
description: Runs manually for pull requests
2020
spec:
2121
env:
22-
PR_COMMENTS_ENABLED: 'true'
23-
GITHUB_BUILD_COMMIT_STATUS_ENABLED: 'true'
22+
ELASTIC_PR_COMMENTS_ENABLED: 'true'
23+
ELASTIC_GITHUB_BUILD_COMMIT_STATUS_ENABLED: 'true'
24+
ELASTIC_GITHUB_STEP_COMMIT_STATUS_ENABLED: 'true'
2425
GITHUB_BUILD_COMMIT_STATUS_CONTEXT: kibana-ci
25-
GITHUB_STEP_COMMIT_STATUS_ENABLED: 'true'
2626
allow_rebuilds: true
2727
branch_configuration: ''
2828
cancel_intermediate_builds: true

‎.buildkite/pipeline-utils/test-failures/annotate.ts‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -171,7 +171,10 @@ export const annotateTestFailures = async () => {
171171

172172
buildkite.setAnnotation('test_failures', 'error', getAnnotation(failures, failureHtmlArtifacts));
173173

174-
if (process.env.PR_COMMENTS_ENABLED === 'true') {
174+
if (
175+
process.env.PR_COMMENTS_ENABLED === 'true' ||
176+
process.env.ELASTIC_PR_COMMENTS_ENABLED === 'true'
177+
) {
175178
buildkite.setMetadata(
176179
'pr_comment:test_failures:body',
177180
getPrComment(failures, failureHtmlArtifacts)

0 commit comments

Comments
 (0)