Skip to content

Commit e7aae7e

Browse files
authored
Merge branch 'main' into fix/flaky-286496-trusted-apps-hash-sync-input-cf20b8f5c047e232
2 parents 15964d5 + bdd6dee commit e7aae7e

2,011 files changed

Lines changed: 118009 additions & 52940 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-scout-report-flaky-tests.yml renamed to .buildkite/pipeline-resource-definitions/kibana-report-flaky-tests.yml

Lines changed: 11 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,10 @@
22
apiVersion: backstage.io/v1alpha1
33
kind: Resource
44
metadata:
5-
name: bk-kibana-scout-report-flaky-tests
6-
description: Aggregates test events from the AppEx QA cluster into a flaky test report and publishes it as a build artifact
5+
name: bk-kibana-report-flaky-tests
6+
description: Aggregates test events from the AppEx QA cluster into a flaky test report, publishes it as a build artifact and checks which flaky suites already have a GitHub issue
77
links:
8-
- url: 'https://buildkite.com/elastic/kibana-scout-report-flaky-tests'
8+
- url: 'https://buildkite.com/elastic/kibana-report-flaky-tests'
99
title: Pipeline link
1010
spec:
1111
type: buildkite-pipeline
@@ -15,27 +15,30 @@ spec:
1515
apiVersion: buildkite.elastic.dev/v1
1616
kind: Pipeline
1717
metadata:
18-
name: kibana / scout / report-flaky-tests
19-
description: Aggregates test events from the AppEx QA cluster into a flaky test report and publishes it as a build artifact
18+
name: kibana / report-flaky-tests
19+
description: Aggregates test events from the AppEx QA cluster into a flaky test report, publishes it as a build artifact and checks which flaky suites already have a GitHub issue
2020
spec:
2121
env:
2222
# Set a channel and flip to 'true' once the report has an owning channel
2323
KIBANA_SLACK_NOTIFICATIONS_ENABLED: 'false'
24-
# Inputs of .buildkite/scripts/steps/scout_report_flaky_tests.sh. Schedules may override
24+
# Inputs of .buildkite/scripts/steps/report_flaky_tests.sh. Schedules may override
2525
# them to produce different reports (other pipelines, consistently failing tests, ...).
2626
FLAKY_TESTS_PIPELINES: 'kibana-on-merge'
2727
FLAKY_TESTS_LOOKBACK_DAYS: '7'
2828
FLAKY_TESTS_CLASSIFICATIONS: 'flaky'
29+
# Repository whose failed-test issues .buildkite/scripts/steps/check_flaky_test_issues.sh
30+
# checks for the flaky suites; read-only
31+
FLAKY_TESTS_GITHUB_REPO: 'elastic/kibana'
2932
allow_rebuilds: true
3033
branch_configuration: main
3134
cancel_intermediate_builds: true
3235
default_branch: main
3336
repository: elastic/kibana
34-
pipeline_file: .buildkite/pipelines/scout_report_flaky_tests.yml
37+
pipeline_file: .buildkite/pipelines/report_flaky_tests.yml
3538
initial_step_plugins:
3639
- sparse-checkout#v1.6.0:
3740
paths:
38-
- .buildkite/pipelines/scout_report_flaky_tests.yml
41+
- .buildkite/pipelines/report_flaky_tests.yml
3942
cleanup_sparse_state: true
4043
provider_settings:
4144
build_branches: false

.buildkite/pipeline-resource-definitions/locations.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ spec:
4848
- https://github.com/elastic/kibana/blob/main/.buildkite/pipeline-resource-definitions/kibana-pr.yml
4949
- https://github.com/elastic/kibana/blob/main/.buildkite/pipeline-resource-definitions/kibana-purge-cloud-deployments.yml
5050
- https://github.com/elastic/kibana/blob/main/.buildkite/pipeline-resource-definitions/kibana-renovate-helper.yml
51-
- https://github.com/elastic/kibana/blob/main/.buildkite/pipeline-resource-definitions/kibana-scout-report-flaky-tests.yml
51+
- https://github.com/elastic/kibana/blob/main/.buildkite/pipeline-resource-definitions/kibana-report-flaky-tests.yml
5252
- https://github.com/elastic/kibana/blob/main/.buildkite/pipeline-resource-definitions/kibana-scout-update-metadata.yml
5353
- https://github.com/elastic/kibana/blob/main/.buildkite/pipeline-resource-definitions/kibana-security-solution-on-merge.yml
5454
- https://github.com/elastic/kibana/blob/main/.buildkite/pipeline-resource-definitions/kibana-serverless-emergency-release.yml

.buildkite/pipelines/fleet/notify_smoke_tests.yml

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

55
steps:
66
- label: ':smoke: Check fleet-smoke-tests for consecutive failures'
7-
command: ts-node .buildkite/scripts/pipelines/fleet_smoke_tests/notify_fleet_smoke_tests.ts
7+
command: node .buildkite/scripts/pipelines/fleet_smoke_tests/notify_fleet_smoke_tests.ts
88
env:
99
DRY_RUN: ${DRY_RUN:-false}
1010
agents:

.buildkite/pipelines/gen_ai_product_docs.yml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -40,13 +40,17 @@ steps:
4040
FTR_CONFIG_GROUP_KEY: 'ftr-ai-infra-gen-ai-inference-api'
4141
FTR_GEN_AI: '1'
4242
FTR_EIS_CCM: '1'
43+
# Keep ES/Kibana server logs on disk so mocha log capture does not OOM on ML-heavy suites
44+
FTR_EXTRA_ARGS: '--writeLogsToPath=data/ftr_servers_logs'
4345
timeout_in_minutes: 180
4446
parallelism: 1
4547
agents:
4648
image: family/kibana-ubuntu-2404
4749
imageProject: elastic-images-prod
4850
provider: gcp
4951
machineType: n2-standard-4
52+
# ES|QL enrichment + multi-product semantic indices need more than the default boot disk
53+
diskSizeGb: 180
5054
preemptible: true
5155
retry:
5256
automatic:

.buildkite/pipelines/gen_ai_security_labs.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,8 @@ steps:
3939
FTR_CONFIG_GROUP_KEY: 'ftr-ai-infra-gen-ai-security-labs'
4040
FTR_GEN_AI: '1'
4141
FTR_EIS_CCM: '1'
42+
# Keep ES/Kibana server logs on disk so mocha log capture does not OOM on ML-heavy suites
43+
FTR_EXTRA_ARGS: '--writeLogsToPath=data/ftr_servers_logs'
4244
timeout_in_minutes: 120
4345
parallelism: 1
4446
agents:

.buildkite/pipelines/gen_ai_testing.yml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,8 @@ steps:
3030
FTR_CONFIG: 'x-pack/platform/test/functional_gen_ai/inference/config.ts'
3131
FTR_CONFIG_GROUP_KEY: 'ftr-ai-infra-gen-ai-inference-api'
3232
FTR_GEN_AI: '1'
33+
# Keep ES/Kibana server logs on disk so mocha log capture does not OOM on ML-heavy suites
34+
FTR_EXTRA_ARGS: '--writeLogsToPath=data/ftr_servers_logs'
3335
FTR_EIS_CCM: '1'
3436
label: AppEx AI-Infra Inference APIs FTR tests
3537
key: ai-infra-gen-ai-inference-api
@@ -40,6 +42,8 @@ steps:
4042
imageProject: elastic-images-prod
4143
provider: gcp
4244
machineType: n2-standard-4
45+
# Product-doc installs (ELSER/E5) are disk-heavy; avoid ES flood-stage / merge stalls
46+
diskSizeGb: 130
4347
preemptible: true
4448
artifact_paths:
4549
- 'target/llm_smoke_judgements.jsonl'

.buildkite/pipelines/pull_request/ai_infra_gen_ai.yml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,13 +11,17 @@ steps:
1111
FTR_CONFIG: 'x-pack/platform/test/functional_gen_ai/inference/config.ts'
1212
FTR_CONFIG_GROUP_KEY: 'ftr-ai-infra-gen-ai-inference-api'
1313
FTR_GEN_AI: '1'
14+
# Keep ES/Kibana server logs on disk so mocha log capture does not OOM on ML-heavy suites
15+
FTR_EXTRA_ARGS: '--writeLogsToPath=data/ftr_servers_logs'
1416
FTR_EIS_CCM: '1'
1517
label: AppEx AI-Infra Inference APIs FTR tests
1618
key: ai-infra-gen-ai-inference-api
1719
timeout_in_minutes: 50
1820
parallelism: 1
1921
agents:
2022
machineType: n2-standard-4
23+
# Product-doc installs (ELSER/E5) are disk-heavy; avoid ES flood-stage / merge stalls
24+
diskSizeGb: 130
2125
preemptible: true
2226
spotZones: us-central1-f,us-central1-c,us-central1-a
2327
artifact_paths:
Lines changed: 33 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,33 @@
1+
steps:
2+
- command: .buildkite/scripts/steps/report_flaky_tests.sh
3+
label: ':mag: Discover flaky tests'
4+
key: discover-flaky-tests
5+
timeout_in_minutes: 30
6+
agents:
7+
image: family/kibana-ubuntu-2404
8+
imageProject: elastic-images-prod
9+
provider: gcp
10+
machineType: n2-standard-4
11+
preemptible: true
12+
spotZones: us-central1-f,us-central1-c,us-central1-a
13+
retry:
14+
automatic:
15+
- exit_status: '-1'
16+
limit: 3
17+
18+
- command: .buildkite/scripts/steps/check_flaky_test_issues.sh
19+
label: ':github: Check GitHub issues of flaky suites'
20+
key: check-flaky-test-issues
21+
depends_on: discover-flaky-tests
22+
timeout_in_minutes: 30
23+
agents:
24+
image: family/kibana-ubuntu-2404
25+
imageProject: elastic-images-prod
26+
provider: gcp
27+
machineType: n2-standard-4
28+
preemptible: true
29+
spotZones: us-central1-f,us-central1-c,us-central1-a
30+
retry:
31+
automatic:
32+
- exit_status: '-1'
33+
limit: 3

.buildkite/pipelines/scout_report_flaky_tests.yml

Lines changed: 0 additions & 16 deletions
This file was deleted.

.buildkite/scripts/pipelines/fleet_smoke_tests/notify_fleet_smoke_tests.ts

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@ import { execSync } from 'child_process';
1414
import fs from 'fs';
1515
import os from 'os';
1616
import path from 'path';
17+
import { fileURLToPath } from 'url';
1718

1819
import { BuildkiteClient } from '#pipeline-utils';
1920

@@ -126,7 +127,7 @@ async function main() {
126127
sendSlackNotification(message);
127128
}
128129

129-
if (require.main === module) {
130+
if (process.argv[1] === fileURLToPath(import.meta.url)) {
130131
main().catch((error) => {
131132
console.error(error);
132133
process.exit(1);

0 commit comments

Comments
 (0)