Skip to content

Commit a717eb3

Browse files
dplumleedplumlee
committed
Merge remote-tracking branch 'upstream/main' into rule-type-diff-algorithm-integration-tests
2 parents d335a02 + e923dca commit a717eb3

1,932 files changed

Lines changed: 281439 additions & 75683 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-artifacts-container-image.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ spec:
1818
description: Kibana container image artifact builds
1919
spec:
2020
env:
21-
SLACK_NOTIFICATIONS_CHANNEL: '#kibana-operations-alerts'
21+
SLACK_NOTIFICATIONS_CHANNEL: '#kibana-serverless-test-alerts'
2222
ELASTIC_SLACK_NOTIFICATIONS_ENABLED: 'true'
2323
allow_rebuilds: true
2424
branch_configuration: main

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

Lines changed: 53 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,53 @@
1+
# yaml-language-server: $schema=https://gist.githubusercontent.com/elasticmachine/988b80dae436cafea07d9a4a460a011d/raw/rre.schema.json
2+
apiVersion: backstage.io/v1alpha1
3+
kind: Resource
4+
metadata:
5+
name: bk-kibana-chrome-forward-testing
6+
description: 'Chrome Forward Testing for Kibana'
7+
links:
8+
- url: 'https://buildkite.com/elastic/kibana-chrome-forward-testing'
9+
title: Pipeline link
10+
spec:
11+
type: buildkite-pipeline
12+
system: buildkite
13+
owner: 'group:kibana-operations'
14+
implementation:
15+
apiVersion: buildkite.elastic.dev/v1
16+
kind: Pipeline
17+
metadata:
18+
name: kibana / chrome forward testing
19+
description: 'Testing Kibana against upcoming versions of Chrome'
20+
spec:
21+
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'
26+
SLACK_NOTIFICATIONS_CHANNEL: '#kibana-operations-alerts'
27+
ELASTIC_SLACK_NOTIFICATIONS_ENABLED: 'true'
28+
29+
allow_rebuilds: true
30+
branch_configuration: main
31+
default_branch: main
32+
repository: elastic/kibana
33+
pipeline_file: .buildkite/scripts/pipelines/pull_request/pipeline.sh
34+
skip_intermediate_builds: true
35+
provider_settings:
36+
prefix_pull_request_fork_branch_names: false
37+
skip_pull_request_builds_for_existing_commits: true
38+
trigger_mode: none
39+
teams:
40+
kibana-operations:
41+
access_level: MANAGE_BUILD_AND_READ
42+
appex-qa:
43+
access_level: MANAGE_BUILD_AND_READ
44+
kibana-tech-leads:
45+
access_level: MANAGE_BUILD_AND_READ
46+
everyone:
47+
access_level: BUILD_AND_READ
48+
# Scheduled runs for the pipeline
49+
schedules:
50+
Daily 12 pm UTC:
51+
cronline: 0 12 * * *
52+
message: Daily Chrome Forward Testing
53+
branch: main

‎.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-resource-definitions/locations.yml‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,8 @@ spec:
1313
- https://github.com/elastic/kibana/blob/main/.buildkite/pipeline-resource-definitions/kibana-artifacts-snapshot.yml
1414
- https://github.com/elastic/kibana/blob/main/.buildkite/pipeline-resource-definitions/kibana-artifacts-staging.yml
1515
- https://github.com/elastic/kibana/blob/main/.buildkite/pipeline-resource-definitions/kibana-artifacts-trigger.yml
16+
- https://github.com/elastic/kibana/blob/main/.buildkite/pipeline-resource-definitions/kibana-chrome-forward-testing.yml
17+
- https://github.com/elastic/kibana/blob/main/.buildkite/pipeline-resource-definitions/kibana-codeql.yml
1618
- https://github.com/elastic/kibana/blob/main/.buildkite/pipeline-resource-definitions/kibana-coverage-daily.yml
1719
- https://github.com/elastic/kibana/blob/main/.buildkite/pipeline-resource-definitions/kibana-es-forward-testing.yml
1820
- https://github.com/elastic/kibana/blob/main/.buildkite/pipeline-resource-definitions/kibana-es-serverless-snapshots.yml
@@ -26,11 +28,12 @@ spec:
2628
- https://github.com/elastic/kibana/blob/main/.buildkite/pipeline-resource-definitions/kibana-on-merge.yml
2729
- https://github.com/elastic/kibana/blob/main/.buildkite/pipeline-resource-definitions/kibana-performance-daily.yml
2830
- https://github.com/elastic/kibana/blob/main/.buildkite/pipeline-resource-definitions/kibana-performance-data-set-extraction-daily.yml
31+
- https://github.com/elastic/kibana/blob/main/.buildkite/pipeline-resource-definitions/kibana-pointer-compression.yml
2932
- https://github.com/elastic/kibana/blob/main/.buildkite/pipeline-resource-definitions/kibana-pr.yml
3033
- https://github.com/elastic/kibana/blob/main/.buildkite/pipeline-resource-definitions/kibana-purge-cloud-deployments.yml
3134
- https://github.com/elastic/kibana/blob/main/.buildkite/pipeline-resource-definitions/kibana-serverless-emergency-release.yml
32-
- https://github.com/elastic/kibana/blob/main/.buildkite/pipeline-resource-definitions/kibana-serverless-quality-gates.yml
3335
- https://github.com/elastic/kibana/blob/main/.buildkite/pipeline-resource-definitions/kibana-serverless-quality-gates-emergency.yml
36+
- https://github.com/elastic/kibana/blob/main/.buildkite/pipeline-resource-definitions/kibana-serverless-quality-gates.yml
3437
- https://github.com/elastic/kibana/blob/main/.buildkite/pipeline-resource-definitions/kibana-serverless-release-testing.yml
3538
- https://github.com/elastic/kibana/blob/main/.buildkite/pipeline-resource-definitions/kibana-serverless-release.yml
3639
- https://github.com/elastic/kibana/blob/main/.buildkite/pipeline-resource-definitions/scalability_testing-daily.yml
@@ -43,5 +46,3 @@ spec:
4346
- https://github.com/elastic/kibana/blob/main/.buildkite/pipeline-resource-definitions/security-solution-quality-gate/kibana-serverless-security-solution-quality-gate-investigations.yml
4447
- https://github.com/elastic/kibana/blob/main/.buildkite/pipeline-resource-definitions/security-solution-quality-gate/kibana-serverless-security-solution-quality-gate-rule-management.yml
4548
- https://github.com/elastic/kibana/blob/main/.buildkite/pipeline-resource-definitions/trigger-version-dependent-jobs.yml
46-
- https://github.com/elastic/kibana/blob/main/.buildkite/pipeline-resource-definitions/kibana-pointer-compression.yml
47-
- https://github.com/elastic/kibana/blob/main/.buildkite/pipeline-resource-definitions/kibana-codeql.yml

‎.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)

‎.buildkite/scripts/lifecycle/post_build.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ set -euo pipefail
55
BUILD_SUCCESSFUL=$(ts-node "$(dirname "${0}")/build_status.ts")
66
export BUILD_SUCCESSFUL
77

8-
if [[ "${GITHUB_BUILD_COMMIT_STATUS_ENABLED:-}" != "true" ]]; then
8+
if [[ "${GITHUB_BUILD_COMMIT_STATUS_ENABLED:-}" != "true" ]] && [[ "${ELASTIC_GITHUB_BUILD_COMMIT_STATUS_ENABLED:-}" != "true" ]]; then
99
"$(dirname "${0}")/commit_status_complete.sh"
1010
fi
1111

‎.buildkite/scripts/lifecycle/pre_build.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ set -euo pipefail
44

55
source .buildkite/scripts/common/util.sh
66

7-
if [[ "${GITHUB_BUILD_COMMIT_STATUS_ENABLED:-}" != "true" ]]; then
7+
if [[ "${GITHUB_BUILD_COMMIT_STATUS_ENABLED:-}" != "true" ]] && [[ "${ELASTIC_GITHUB_BUILD_COMMIT_STATUS_ENABLED:-}" != "true" ]]; then
88
"$(dirname "${0}")/commit_status_start.sh"
99
fi
1010

‎.buildkite/scripts/steps/artifacts/docker_image.sh‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -133,7 +133,6 @@ steps:
133133
env:
134134
SERVICE_COMMIT_HASH: "$GIT_ABBREV_COMMIT"
135135
SERVICE: kibana
136-
SLACK_NOTIFICATIONS_CHANNEL: '#kibana-serverless-test-alerts'
137136
REMOTE_SERVICE_CONFIG: https://raw.githubusercontent.com/elastic/serverless-gitops/main/gen/gpctl/kibana/dev.yaml
138137
GPCTL_PROMOTE_DRY_RUN: ${DRY_RUN:-false}
139138
EOF

‎.buildkite/scripts/steps/capture_oas_snapshot.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ set -euo pipefail
55
source .buildkite/scripts/common/util.sh
66

77
echo --- Capture OAS snapshot
8-
cmd="node scripts/capture_oas_snapshot --include-path /api/status --include-path /api/alerting/rule/ --include-path /api/alerting/rules --include-path /api/actions --include-path /api/security/role --include-path /api/spaces"
8+
cmd="node scripts/capture_oas_snapshot --include-path /api/status --include-path /api/alerting/rule/ --include-path /api/alerting/rules --include-path /api/actions --include-path /api/security/role --include-path /api/spaces --include-path /api/fleet"
99
if is_pr && ! is_auto_commit_disabled; then
1010
cmd="$cmd --update"
1111
fi

0 commit comments

Comments
 (0)