Skip to content

Commit 7a6c662

Browse files
HeenawterHeenawter
authored
Merge branch '9.0' into backport/9.0/pr-235569
2 parents 7aa078f + 146572b commit 7a6c662

File tree

42 files changed

+1484
-300
lines changed

Some content is hidden

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

42 files changed

+1484
-300
lines changed

‎.buildkite/pipelines/chrome_forward_testing.yml‎

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -61,6 +61,19 @@ steps:
6161
- exit_status: '*'
6262
limit: 1
6363

64+
- command: .buildkite/scripts/steps/test/scout_test_run_builder.sh
65+
label: 'Scout Test Run Builder'
66+
agents:
67+
machineType: n2-standard-2
68+
key: build_scout_tests
69+
timeout_in_minutes: 10
70+
env:
71+
SCOUT_CONFIGS_SCRIPT: '.buildkite/scripts/steps/test/scout_configs.sh'
72+
retry:
73+
automatic:
74+
- exit_status: '*'
75+
limit: 1
76+
6477
- command: .buildkite/scripts/steps/functional/security_solution_rule_management.sh
6578
label: 'Rule Management - Security Solution Cypress Tests'
6679
agents:

‎.buildkite/pipelines/es_snapshots/verify.yml‎

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -56,6 +56,21 @@ steps:
5656
- exit_status: '*'
5757
limit: 1
5858

59+
- command: .buildkite/scripts/steps/test/scout_test_run_builder.sh
60+
label: 'Scout Test Run Builder'
61+
agents:
62+
image: family/kibana-ubuntu-2404
63+
imageProject: elastic-images-prod
64+
provider: gcp
65+
machineType: n2-standard-2
66+
timeout_in_minutes: 10
67+
env:
68+
SCOUT_CONFIGS_SCRIPT: '.buildkite/scripts/steps/test/scout_configs.sh'
69+
retry:
70+
automatic:
71+
- exit_status: '*'
72+
limit: 1
73+
5974
- command: .buildkite/scripts/steps/es_snapshots/trigger_promote.sh
6075
label: Trigger promotion
6176
timeout_in_minutes: 10

‎.buildkite/pipelines/fleet/package_registry.yml‎

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -46,6 +46,21 @@ steps:
4646
- exit_status: '*'
4747
limit: 1
4848

49+
- command: .buildkite/scripts/steps/test/scout_test_run_builder.sh
50+
label: 'Scout Test Run Builder'
51+
agents:
52+
image: family/kibana-ubuntu-2404
53+
imageProject: elastic-images-prod
54+
provider: gcp
55+
machineType: n2-standard-2
56+
timeout_in_minutes: 10
57+
env:
58+
SCOUT_CONFIGS_SCRIPT: '.buildkite/scripts/steps/test/scout_configs.sh'
59+
retry:
60+
automatic:
61+
- exit_status: '*'
62+
limit: 1
63+
4964
- command: .buildkite/scripts/steps/functional/defend_workflows.sh
5065
label: 'Defend Workflows Cypress Tests'
5166
agents:

‎.buildkite/pipelines/on_merge.yml‎

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -178,6 +178,22 @@ steps:
178178
- exit_status: '*'
179179
limit: 1
180180

181+
- command: .buildkite/scripts/steps/test/scout_test_run_builder.sh
182+
label: 'Scout Test Run Builder'
183+
agents:
184+
image: family/kibana-ubuntu-2404
185+
imageProject: elastic-images-prod
186+
provider: gcp
187+
machineType: n2-standard-2
188+
diskSizeGb: 85
189+
timeout_in_minutes: 10
190+
env:
191+
SCOUT_CONFIGS_SCRIPT: '.buildkite/scripts/steps/test/scout_configs.sh'
192+
retry:
193+
automatic:
194+
- exit_status: '*'
195+
limit: 1
196+
181197
- command: .buildkite/scripts/steps/functional/security_serverless_entity_analytics.sh
182198
label: 'Serverless Entity Analytics - Security Cypress Tests'
183199
agents:

‎.buildkite/pipelines/on_merge_unsupported_ftrs.yml‎

Lines changed: 1 addition & 40 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ steps:
3838
preemptible: true
3939
depends_on: build
4040
env:
41-
PING_SLACK_TEAM: "@obs-ux-management-team"
41+
PING_SLACK_TEAM: '@obs-ux-management-team'
4242
timeout_in_minutes: 120
4343
artifact_paths:
4444
- 'x-pack/solutions/observability/plugins/synthetics/e2e/.journeys/**/*'
@@ -48,42 +48,3 @@ steps:
4848
limit: 3
4949
- exit_status: '*'
5050
limit: 1
51-
52-
- command: .buildkite/scripts/steps/functional/inventory_cypress.sh
53-
label: 'Inventory Cypress Tests'
54-
agents:
55-
image: family/kibana-ubuntu-2404
56-
imageProject: elastic-images-prod
57-
provider: gcp
58-
machineType: n2-standard-4
59-
preemptible: true
60-
depends_on: build
61-
env:
62-
PING_SLACK_TEAM: "@obs-ux-infra_services-team"
63-
timeout_in_minutes: 120
64-
retry:
65-
automatic:
66-
- exit_status: '-1'
67-
limit: 3
68-
- exit_status: '*'
69-
limit: 1
70-
71-
- command: .buildkite/scripts/steps/test/scout_test_run_builder.sh
72-
label: 'Scout Test Run Builder'
73-
agents:
74-
image: family/kibana-ubuntu-2404
75-
imageProject: elastic-images-prod
76-
provider: gcp
77-
machineType: n2-standard-2
78-
preemptible: true
79-
depends_on: build
80-
timeout_in_minutes: 10
81-
env:
82-
SCOUT_CONFIGS_SCRIPT: '.buildkite/scripts/steps/test/scout_configs.sh'
83-
PING_SLACK_TEAM: "@appex-qa-team"
84-
retry:
85-
automatic:
86-
- exit_status: 10
87-
limit: 0
88-
- exit_status: '*'
89-
limit: 1

‎.buildkite/pipelines/pointer_compression.yml‎

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -49,6 +49,22 @@ steps:
4949
- exit_status: '*'
5050
limit: 1
5151

52+
- command: .buildkite/scripts/steps/test/scout_test_run_builder.sh
53+
label: 'Scout Test Run Builder'
54+
agents:
55+
image: family/kibana-ubuntu-2404
56+
imageProject: elastic-images-prod
57+
provider: gcp
58+
machineType: n2-standard-2
59+
key: build_scout_tests
60+
timeout_in_minutes: 10
61+
env:
62+
SCOUT_CONFIGS_SCRIPT: '.buildkite/scripts/steps/test/scout_configs.sh'
63+
retry:
64+
automatic:
65+
- exit_status: '*'
66+
limit: 1
67+
5268
- command: .buildkite/scripts/steps/functional/security_solution_rule_management.sh
5369
label: 'Rule Management - Security Solution Cypress Tests'
5470
agents:

‎.buildkite/pipelines/pull_request/scout_tests.yml‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,5 @@ steps:
88
SCOUT_CONFIGS_SCRIPT: '.buildkite/scripts/steps/test/scout_configs.sh'
99
retry:
1010
automatic:
11-
# No retry when Scout configs fail
12-
- exit_status: 10
13-
limit: 0
1411
- exit_status: '*'
1512
limit: 1

‎.buildkite/scripts/pipelines/pull_request/pipeline.ts‎

Lines changed: 2 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -64,6 +64,8 @@ const getPipeline = (filename: string, removeSteps = true) => {
6464

6565
pipeline.push(getPipeline('.buildkite/pipelines/pull_request/base.yml', false));
6666

67+
pipeline.push(getPipeline('.buildkite/pipelines/pull_request/scout_tests.yml'));
68+
6769
if (await doAnyChangesMatch([/^src\/platform\/packages\/private\/kbn-handlebars/])) {
6870
pipeline.push(getPipeline('.buildkite/pipelines/pull_request/kbn_handlebars.yml'));
6971
}
@@ -476,24 +478,6 @@ const getPipeline = (filename: string, removeSteps = true) => {
476478
);
477479
}
478480

479-
if (
480-
(await doAnyChangesMatch([
481-
/^src\/platform\/packages\/shared\/kbn-scout/,
482-
/^src\/platform\/packages\/private\/kbn-scout-info/,
483-
/^src\/platform\/packages\/private\/kbn-scout-reporting/,
484-
/^x-pack\/platform\/plugins\/shared\/maps/,
485-
/^x-pack\/platform\/plugins\/private\/discover_enhanced/,
486-
/^x-pack\/solutions\/observability\/packages\/kbn-scout-oblt/,
487-
/^x-pack\/solutions\/observability\/plugins\/apm/,
488-
/^x-pack\/solutions\/observability\/plugins\/observability_onboarding/,
489-
/^x-pack\/solutions\/security\/packages\/kbn-scout-security/,
490-
/^x-pack\/solutions\/security\/plugins\/security_solution\/public\/flyout/,
491-
])) ||
492-
GITHUB_PR_LABELS.includes('ci:scout-ui-tests')
493-
) {
494-
pipeline.push(getPipeline('.buildkite/pipelines/pull_request/scout_tests.yml'));
495-
}
496-
497481
if (GITHUB_PR_LABELS.includes('ci:security-genai-run-evals')) {
498482
pipeline.push(
499483
getPipeline('.buildkite/pipelines/pull_request/security_solution/gen_ai_evals.yml')

‎.buildkite/scripts/steps/code_coverage/jest_parallel.sh‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -86,5 +86,9 @@ mv target/kibana-coverage/jest-combined/coverage-final.json \
8686
echo "--- Jest [$TEST_TYPE] configs complete"
8787
printf "%s\n" "${results[@]}"
8888

89+
# Scout reporter
90+
echo "--- Upload Scout reporter events to AppEx QA's team cluster"
91+
node scripts/scout upload-events --dontFailOnError
92+
8993
# Force exit 0 to ensure the next build step starts.
9094
exit 0

‎.buildkite/scripts/steps/test/ftr_configs.sh‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -114,4 +114,8 @@ echo "--- FTR configs complete"
114114
printf "%s\n" "${results[@]}"
115115
echo ""
116116

117+
# Scout reporter
118+
echo "--- Upload Scout reporter events to AppEx QA's team cluster"
119+
node scripts/scout upload-events --dontFailOnError
120+
117121
exit $exitCode

0 commit comments

Comments
 (0)