Skip to content

Commit f63e351

Browse files
kibanamachinekibanamachine
authored
Merge branch 'main' into ab_testing_onboarding
2 parents 0833071 + c7e360b commit f63e351

794 files changed

Lines changed: 10772 additions & 3113 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: 14 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -79,25 +79,12 @@ disabled:
7979
- x-pack/test_serverless/functional/config.base.ts
8080
- x-pack/test_serverless/shared/config.base.ts
8181

82-
# Serverless configs, currently only for manual tests runs, CI integration planned
83-
- x-pack/test_serverless/api_integration/test_suites/common/config.ts
84-
- x-pack/test_serverless/api_integration/test_suites/observability/config.ts
85-
- x-pack/test_serverless/api_integration/test_suites/observability/config.feature_flags.ts
86-
- x-pack/test_serverless/api_integration/test_suites/search/config.ts
87-
- x-pack/test_serverless/api_integration/test_suites/search/config.feature_flags.ts
88-
- x-pack/test_serverless/api_integration/test_suites/security/config.ts
89-
- x-pack/test_serverless/api_integration/test_suites/security/config.feature_flags.ts
90-
- x-pack/test_serverless/functional/test_suites/common/config.ts
91-
- x-pack/test_serverless/functional/test_suites/observability/config.ts
82+
# Serverless feature flag config files (move to enabled after tests are added)
9283
- x-pack/test_serverless/functional/test_suites/observability/config.feature_flags.ts
93-
- x-pack/test_serverless/functional/test_suites/observability/config.examples.ts
94-
- x-pack/test_serverless/functional/test_suites/search/config.ts
84+
- x-pack/test_serverless/api_integration/test_suites/search/config.feature_flags.ts
9585
- x-pack/test_serverless/functional/test_suites/search/config.feature_flags.ts
96-
- x-pack/test_serverless/functional/test_suites/search/config.examples.ts
97-
- x-pack/test_serverless/functional/test_suites/search/config.screenshots.ts
98-
- x-pack/test_serverless/functional/test_suites/security/config.ts
86+
- x-pack/test_serverless/api_integration/test_suites/security/config.feature_flags.ts
9987
- x-pack/test_serverless/functional/test_suites/security/config.feature_flags.ts
100-
- x-pack/test_serverless/functional/test_suites/security/config.examples.ts
10188

10289
defaultQueue: 'n2-4-spot'
10390
enabled:
@@ -411,6 +398,17 @@ enabled:
411398
- x-pack/test/ui_capabilities/spaces_only/config.ts
412399
- x-pack/test/upgrade_assistant_integration/config.js
413400
- x-pack/test/usage_collection/config.ts
401+
- x-pack/test_serverless/api_integration/test_suites/observability/config.ts
402+
- x-pack/test_serverless/api_integration/test_suites/search/config.ts
403+
- x-pack/test_serverless/api_integration/test_suites/security/config.ts
404+
- x-pack/test_serverless/functional/test_suites/observability/config.ts
405+
- x-pack/test_serverless/functional/test_suites/observability/config.examples.ts
406+
- x-pack/test_serverless/api_integration/test_suites/observability/config.feature_flags.ts
407+
- x-pack/test_serverless/functional/test_suites/search/config.ts
408+
- x-pack/test_serverless/functional/test_suites/search/config.examples.ts
409+
- x-pack/test_serverless/functional/test_suites/search/config.screenshots.ts
410+
- x-pack/test_serverless/functional/test_suites/security/config.ts
411+
- x-pack/test_serverless/functional/test_suites/security/config.examples.ts
414412
- x-pack/performance/journeys/ecommerce_dashboard.ts
415413
- x-pack/performance/journeys/ecommerce_dashboard_map_only.ts
416414
- x-pack/performance/journeys/flight_dashboard.ts

‎.buildkite/pipelines/on_merge.yml‎

Lines changed: 36 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -78,16 +78,44 @@ 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
81+
- command: .buildkite/scripts/steps/functional/security_serverless.sh
82+
label: 'Serverless Security Cypress Tests'
8683
agents:
87-
queue: 'kibana-default'
84+
queue: n2-4-spot
85+
depends_on: build
86+
timeout_in_minutes: 40
87+
parallelism: 2
88+
retry:
89+
automatic:
90+
- exit_status: '*'
91+
limit: 1
92+
93+
- command: .buildkite/scripts/steps/functional/security_serverless_explore.sh
94+
label: 'Serverless Explore - Security Solution Cypress Tests'
95+
agents:
96+
queue: n2-4-spot
97+
depends_on: build
98+
timeout_in_minutes: 60
99+
parallelism: 2
100+
retry:
101+
automatic:
102+
- exit_status: '*'
103+
limit: 1
104+
105+
- command: .buildkite/scripts/steps/functional/security_serverless_investigations.sh
106+
label: 'Serverless Investigations - Security Solution Cypress Tests'
107+
agents:
108+
queue: n2-4-spot
109+
depends_on: build
110+
timeout_in_minutes: 120
111+
parallelism: 2
112+
retry:
113+
automatic:
114+
- exit_status: '*'
115+
limit: 1
88116

89-
- command: '.buildkite/scripts/steps/functional/on_merge_serverless_ftrs.sh'
90-
label: Trigger serverless ftr tests
117+
- command: '.buildkite/scripts/steps/functional/on_merge_unsupported_ftrs.sh'
118+
label: Trigger unsupported ftr tests
91119
timeout_in_minutes: 10
92120
depends_on:
93121
- build

‎.buildkite/pipelines/pull_request/base.yml‎

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

59-
- command: SERVERLESS_ENVIRONMENT=observability .buildkite/scripts/steps/functional/serverless_ftr.sh
60-
label: 'Serverless Observability Tests'
61-
agents:
62-
queue: n2-4-spot
63-
depends_on: build
64-
timeout_in_minutes: 40
65-
soft_fail:
66-
- exit_status: 10
67-
retry:
68-
automatic:
69-
- exit_status: '-1'
70-
limit: 3
71-
72-
- command: SERVERLESS_ENVIRONMENT=observability.examples .buildkite/scripts/steps/functional/serverless_ftr.sh
73-
label: 'Serverless Observability Examples Tests'
74-
agents:
75-
queue: n2-4-spot
76-
depends_on: build
77-
timeout_in_minutes: 40
78-
soft_fail:
79-
- exit_status: 10
80-
retry:
81-
automatic:
82-
- exit_status: '-1'
83-
limit: 3
84-
85-
- command: SERVERLESS_ENVIRONMENT=search .buildkite/scripts/steps/functional/serverless_ftr.sh
86-
label: 'Serverless Search Tests'
87-
agents:
88-
queue: n2-4-spot
89-
depends_on: build
90-
timeout_in_minutes: 40
91-
soft_fail:
92-
- exit_status: 10
93-
retry:
94-
automatic:
95-
- exit_status: '-1'
96-
limit: 3
97-
98-
- command: SERVERLESS_ENVIRONMENT=search.examples .buildkite/scripts/steps/functional/serverless_ftr.sh
99-
label: 'Serverless Search Examples Tests'
100-
agents:
101-
queue: n2-4-spot
102-
depends_on: build
103-
timeout_in_minutes: 40
104-
soft_fail:
105-
- exit_status: 10
106-
retry:
107-
automatic:
108-
- exit_status: '-1'
109-
limit: 3
110-
111-
- command: SERVERLESS_ENVIRONMENT=security .buildkite/scripts/steps/functional/serverless_ftr.sh
112-
label: 'Serverless Security Tests'
113-
agents:
114-
queue: n2-4-spot
115-
depends_on: build
116-
timeout_in_minutes: 40
117-
soft_fail:
118-
- exit_status: 10
119-
retry:
120-
automatic:
121-
- exit_status: '-1'
122-
limit: 3
123-
124-
- command: SERVERLESS_ENVIRONMENT=security.examples .buildkite/scripts/steps/functional/serverless_ftr.sh
125-
label: 'Serverless Security Examples Tests'
126-
agents:
127-
queue: n2-4-spot
128-
depends_on: build
129-
timeout_in_minutes: 40
130-
soft_fail:
131-
- exit_status: 10
132-
retry:
133-
automatic:
134-
- exit_status: '-1'
135-
limit: 3
136-
13759
- command: .buildkite/scripts/steps/functional/security_serverless.sh
13860
label: 'Serverless Security Cypress Tests'
13961
agents:
14062
queue: n2-4-spot
14163
depends_on: build
14264
timeout_in_minutes: 40
14365
parallelism: 2
144-
soft_fail: true
14566
retry:
14667
automatic:
14768
- exit_status: '*'
@@ -154,7 +75,6 @@ steps:
15475
# queue: n2-4-spot
15576
# depends_on: build
15677
# timeout_in_minutes: 40
157-
# soft_fail: true
15878
# retry:
15979
# automatic:
16080
# - exit_status: '*'
@@ -167,7 +87,6 @@ steps:
16787
depends_on: build
16888
timeout_in_minutes: 40
16989
parallelism: 2
170-
soft_fail: true
17190
retry:
17291
automatic:
17392
- exit_status: '*'
@@ -180,7 +99,6 @@ steps:
18099
depends_on: build
181100
timeout_in_minutes: 40
182101
parallelism: 2
183-
soft_fail: true
184102
retry:
185103
automatic:
186104
- exit_status: '*'

‎.buildkite/pipelines/pull_request/osquery_cypress.yml‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,8 @@ steps:
1010
automatic:
1111
- exit_status: '*'
1212
limit: 1
13+
artifact_paths:
14+
- "target/kibana-osquery/**/*"
1315

1416
- command: .buildkite/scripts/steps/functional/osquery_cypress_burn.sh
1517
label: 'Osquery Cypress Tests, burning changed specs'
@@ -20,6 +22,8 @@ steps:
2022
soft_fail: true
2123
retry:
2224
automatic: false
25+
artifact_paths:
26+
- "target/kibana-osquery/**/*"
2327

2428
# Error: self-signed certificate in certificate chain
2529
# - command: .buildkite/scripts/steps/functional/security_serverless_osquery.sh
@@ -33,3 +37,5 @@ steps:
3337
# automatic:
3438
# - exit_status: '*'
3539
# limit: 1
40+
# artifact_paths:
41+
# - "target/kibana-osquery/**/*"

‎.buildkite/pipelines/serverless.yml‎

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

‎.buildkite/scripts/steps/functional/on_merge_serverless_ftrs.sh‎

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

0 commit comments

Comments
 (0)