Skip to content

Commit 4d26397

Browse files
jgowdyelasticjgowdyelastic
authored
Merge branch 'main' into reinstating-cold-and-frozen-tier-filters-to-some-modules
2 parents 9ca7181 + f964948 commit 4d26397

6,230 files changed

Lines changed: 236770 additions & 147827 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/ftr_configs.yml‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -47,6 +47,9 @@ disabled:
4747
- x-pack/plugins/apm/ftr_e2e/ftr_config_open.ts
4848
- x-pack/plugins/apm/ftr_e2e/ftr_config_run.ts
4949
- x-pack/plugins/apm/ftr_e2e/ftr_config.ts
50+
- x-pack/plugins/profiling/e2e/ftr_config_open.ts
51+
- x-pack/plugins/profiling/e2e/ftr_config_runner.ts
52+
- x-pack/plugins/profiling/e2e/ftr_config.ts
5053

5154
# Elastic Synthetics configs
5255
- x-pack/plugins/synthetics/e2e/config.ts
@@ -68,6 +71,9 @@ disabled:
6871
# Scalability testing config that we run in its own pipeline
6972
- x-pack/test/scalability/config.ts
7073

74+
# Asset Manager configs, in tech preview, will move to enabled after more stability introduced
75+
- x-pack/test/api_integration/apis/asset_manager/config.ts
76+
7177
defaultQueue: 'n2-4-spot'
7278
enabled:
7379
- test/accessibility/config.ts
@@ -146,6 +152,7 @@ enabled:
146152
- x-pack/test/api_integration/config_security_basic.ts
147153
- x-pack/test/api_integration/config_security_trial.ts
148154
- x-pack/test/api_integration/apis/aiops/config.ts
155+
- x-pack/test/api_integration/apis/asset_manager/config_when_disabled.ts
149156
- x-pack/test/api_integration/apis/cases/config.ts
150157
- x-pack/test/api_integration/apis/cloud_security_posture/config.ts
151158
- x-pack/test/api_integration/apis/console/config.ts
@@ -359,4 +366,5 @@ enabled:
359366
- x-pack/performance/journeys/ecommerce_dashboard_saved_search_only.ts
360367
- x-pack/performance/journeys/ecommerce_dashboard_tsvb_gauge_only.ts
361368
- x-pack/performance/journeys/dashboard_listing_page.ts
369+
- x-pack/performance/journeys/cloud_security_dashboard.ts
362370
- x-pack/test/custom_branding/config.ts

‎.buildkite/pipeline-utils/ci-stats/pick_test_group_run_order.ts‎

Lines changed: 18 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -179,6 +179,15 @@ export async function pickTestGroupRunOrder() {
179179
throw new Error(`invalid FUNCTIONAL_MAX_MINUTES: ${process.env.FUNCTIONAL_MAX_MINUTES}`);
180180
}
181181

182+
/**
183+
* This env variable corresponds to the env stanza within
184+
* https://github.com/elastic/kibana/blob/bc2cb5dc613c3d455a5fed9c54450fd7e46ffd92/.buildkite/pipelines/code_coverage/daily.yml#L17
185+
*
186+
* It is a flag that signals the job for which test runners will be executed.
187+
*
188+
* For example in code coverage pipeline definition, it is "limited"
189+
* to 'unit,integration'. This means FTR tests will not be executed.
190+
*/
182191
const LIMIT_CONFIG_TYPE = process.env.LIMIT_CONFIG_TYPE
183192
? process.env.LIMIT_CONFIG_TYPE.split(',')
184193
.map((t) => t.trim())
@@ -218,9 +227,10 @@ export async function pickTestGroupRunOrder() {
218227
: ['build'];
219228

220229
const { defaultQueue, ftrConfigsByQueue } = getEnabledFtrConfigs(FTR_CONFIG_PATTERNS);
221-
if (!LIMIT_CONFIG_TYPE.includes('functional')) {
222-
ftrConfigsByQueue.clear();
223-
}
230+
231+
const ftrConfigsIncluded = LIMIT_CONFIG_TYPE.includes('functional');
232+
233+
if (!ftrConfigsIncluded) ftrConfigsByQueue.clear();
224234

225235
const jestUnitConfigs = LIMIT_CONFIG_TYPE.includes('unit')
226236
? globby.sync(['**/jest.config.js', '!**/__fixtures__/**'], {
@@ -377,9 +387,11 @@ export async function pickTestGroupRunOrder() {
377387
Fs.writeFileSync('jest_run_order.json', JSON.stringify({ unit, integration }, null, 2));
378388
bk.uploadArtifacts('jest_run_order.json');
379389

380-
// write the config for functional steps to an artifact that can be used by the individual functional jobs
381-
Fs.writeFileSync('ftr_run_order.json', JSON.stringify(ftrRunOrder, null, 2));
382-
bk.uploadArtifacts('ftr_run_order.json');
390+
if (ftrConfigsIncluded) {
391+
// write the config for functional steps to an artifact that can be used by the individual functional jobs
392+
Fs.writeFileSync('ftr_run_order.json', JSON.stringify(ftrRunOrder, null, 2));
393+
bk.uploadArtifacts('ftr_run_order.json');
394+
}
383395

384396
// upload the step definitions to Buildkite
385397
bk.uploadSteps(

‎.buildkite/pipelines/code_coverage/daily.yml‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,18 +13,16 @@ steps:
1313
queue: kibana-default
1414
env:
1515
FTR_CONFIGS_DEPS: ''
16-
# LIMIT_CONFIG_TYPE: 'unit,functional,integration'
1716
LIMIT_CONFIG_TYPE: 'unit,integration'
1817
JEST_UNIT_SCRIPT: '.buildkite/scripts/steps/code_coverage/jest.sh'
1918
JEST_INTEGRATION_SCRIPT: '.buildkite/scripts/steps/code_coverage/jest_integration.sh'
2019

2120
- command: .buildkite/scripts/steps/code_coverage/ingest.sh
2221
label: 'Merge and Ingest'
2322
agents:
24-
queue: c2-16
23+
queue: n2-4-spot
2524
depends_on:
2625
- jest
2726
- jest-integration
28-
# - ftr-configs
2927
timeout_in_minutes: 30
3028
key: ingest

‎.buildkite/pipelines/on_merge.yml‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -78,6 +78,14 @@ steps:
7878
- exit_status: '*'
7979
limit: 1
8080

81+
- command: '.buildkite/scripts/steps/functional/on_merge_unsupported_ftrs.sh'
82+
label: Trigger unsupported ftr tests
83+
timeout_in_minutes: 10
84+
depends_on:
85+
- build
86+
agents:
87+
queue: 'kibana-default'
88+
8189
- command: .buildkite/scripts/steps/lint.sh
8290
label: 'Linting'
8391
agents:

‎.buildkite/pipelines/on_merge_unsupported_ftrs.yml‎

Lines changed: 79 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,79 @@
1+
steps:
2+
- command: .buildkite/scripts/lifecycle/pre_build.sh
3+
label: Pre-Build
4+
timeout_in_minutes: 10
5+
agents:
6+
queue: kibana-default
7+
retry:
8+
automatic:
9+
- exit_status: '*'
10+
limit: 1
11+
12+
- command: .buildkite/scripts/steps/build_kibana.sh
13+
label: Build Kibana Distribution and Plugins
14+
agents:
15+
queue: n2-16-spot
16+
key: build
17+
if: "build.env('KIBANA_BUILD_ID') == null || build.env('KIBANA_BUILD_ID') == ''"
18+
timeout_in_minutes: 60
19+
retry:
20+
automatic:
21+
- exit_status: '-1'
22+
limit: 3
23+
24+
- command: .buildkite/scripts/steps/functional/apm_cypress.sh
25+
label: 'APM Cypress Tests'
26+
agents:
27+
queue: n2-4-spot
28+
depends_on: build
29+
timeout_in_minutes: 120
30+
parallelism: 4
31+
retry:
32+
automatic:
33+
- exit_status: '-1'
34+
limit: 3
35+
- exit_status: '*'
36+
limit: 1
37+
38+
- command: .buildkite/scripts/steps/functional/profiling_cypress.sh
39+
label: 'Profling Cypress Tests'
40+
agents:
41+
queue: n2-4-spot
42+
depends_on: build
43+
timeout_in_minutes: 120
44+
parallelism: 4
45+
retry:
46+
automatic:
47+
- exit_status: '-1'
48+
limit: 3
49+
- exit_status: '*'
50+
limit: 1
51+
52+
- command: .buildkite/scripts/steps/functional/security_solution.sh
53+
label: 'Security Solution Tests'
54+
agents:
55+
queue: n2-4-spot
56+
depends_on: build
57+
timeout_in_minutes: 120
58+
parallelism: 4
59+
retry:
60+
automatic:
61+
- exit_status: '-1'
62+
limit: 3
63+
- exit_status: '*'
64+
limit: 1
65+
66+
- command: .buildkite/scripts/steps/functional/synthetics_plugin.sh
67+
label: 'Synthetics @elastic/synthetics Tests'
68+
agents:
69+
queue: n2-4-spot
70+
depends_on: build
71+
timeout_in_minutes: 120
72+
artifact_paths:
73+
- 'x-pack/plugins/synthetics/e2e/.journeys/**/*'
74+
retry:
75+
automatic:
76+
- exit_status: '-1'
77+
limit: 3
78+
- exit_status: '*'
79+
limit: 1

‎.buildkite/pipelines/pull_request/profiling_cypress.yml‎

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
steps:
2+
- command: .buildkite/scripts/steps/functional/profiling_cypress.sh
3+
label: 'Profiling Cypress Tests'
4+
agents:
5+
queue: n2-4-spot
6+
depends_on: build
7+
timeout_in_minutes: 120
8+
parallelism: 2
9+
retry:
10+
automatic:
11+
- exit_status: '-1'
12+
limit: 3
13+
- exit_status: '*'
14+
limit: 1

‎.buildkite/pipelines/scalability/api_capacity_testing_daily.yml‎

Lines changed: 38 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,38 @@
1+
steps:
2+
- label: 'Pre-Build'
3+
command: .buildkite/scripts/lifecycle/pre_build.sh
4+
agents:
5+
queue: kibana-default
6+
7+
- wait
8+
9+
- label: 'Build Kibana Distribution and Plugins'
10+
command: .buildkite/scripts/steps/build_kibana.sh
11+
agents:
12+
queue: n2-16-spot
13+
key: build
14+
if: "build.env('KIBANA_BUILD_ID') == null || build.env('KIBANA_BUILD_ID') == ''"
15+
timeout_in_minutes: 60
16+
retry:
17+
automatic:
18+
- exit_status: '-1'
19+
limit: 3
20+
21+
- label: ':kibana: APIs Capacity Tests'
22+
command: .buildkite/scripts/steps/scalability/api_capacity_testing.sh
23+
agents:
24+
queue: kb-static-scalability
25+
depends_on: build
26+
timeout_in_minutes: 90
27+
retry:
28+
automatic:
29+
- exit_status: '*'
30+
limit: 1
31+
32+
- wait: ~
33+
continue_on_failure: true
34+
35+
- label: 'Post-Build'
36+
command: .buildkite/scripts/lifecycle/post_build.sh
37+
agents:
38+
queue: kibana-default

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

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -115,6 +115,13 @@ const uploadPipeline = (pipelineContent: string | object) => {
115115
pipeline.push(getPipeline('.buildkite/pipelines/pull_request/apm_cypress.yml'));
116116
}
117117

118+
if (
119+
(await doAnyChangesMatch([/^x-pack\/plugins\/profiling/])) ||
120+
GITHUB_PR_LABELS.includes('ci:all-cypress-suites')
121+
) {
122+
pipeline.push(getPipeline('.buildkite/pipelines/pull_request/profiling_cypress.yml'));
123+
}
124+
118125
if (
119126
(await doAnyChangesMatch([/^x-pack\/plugins\/fleet/, /^x-pack\/test\/fleet_cypress/])) ||
120127
GITHUB_PR_LABELS.includes('ci:all-cypress-suites')

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -82,6 +82,7 @@ if [[ "$BUILDKITE_BRANCH" == "$KIBANA_BASE_BRANCH" ]]; then
8282
cat << EOF | buildkite-agent pipeline upload
8383
steps:
8484
- trigger: k8s-gitops-update-image-tag
85+
async: true
8586
label: ":argo: Update image tag for Kibana"
8687
branches: main
8788
build:

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

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

0 commit comments

Comments
 (0)