Skip to content

Commit b567b72

Browse files
Merge branch '9.3' into backport/9.3/pr-245449
2 parents a4858a1 + 66980a0 commit b567b72

84 files changed

Lines changed: 1668 additions & 1824 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_base_serverless_configs.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,10 +9,11 @@ disabled:
99
- x-pack/platform/test/serverless/api_integration/config.base.ts
1010
- x-pack/platform/test/serverless/functional/config.base.ts
1111

12-
enabled:
1312
# Serverless deployment-agnostic configs to run platform api-integration tests
1413
- x-pack/platform/test/api_integration_deployment_agnostic/configs/serverless/oblt.serverless.config.ts
1514
- x-pack/platform/test/api_integration_deployment_agnostic/configs/serverless/search.serverless.config.ts
1615
- x-pack/platform/test/api_integration_deployment_agnostic/configs/serverless/security.serverless.config.ts
1716
- x-pack/platform/test/api_integration_deployment_agnostic/configs/serverless/oblt.logs_essentials.serverless.config.ts
1817
- x-pack/platform/test/api_integration_deployment_agnostic/configs/serverless/oblt.streams.serverless.config.ts
18+
19+
enabled:

.buildkite/ftr_oblt_serverless_configs.yml

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,6 @@ disabled:
99
# Empty configs
1010
- x-pack/solutions/observability/test/serverless/api_integration/configs/config.feature_flags.ts
1111

12-
defaultQueue: 'n2-4-spot'
13-
enabled:
1412
- x-pack/solutions/observability/test/serverless/api_integration/configs/config.ts
1513
- x-pack/solutions/observability/test/serverless/api_integration/configs/config.logs_essentials.ts
1614
- x-pack/platform/test/serverless/api_integration/configs/observability/config.group1.ts
@@ -47,3 +45,6 @@ enabled:
4745
- x-pack/solutions/observability/test/api_integration_deployment_agnostic/configs/serverless/oblt.synthetics.serverless.config.ts
4846
- x-pack/solutions/observability/test/api_integration_deployment_agnostic/feature_flag_configs/serverless/oblt.serverless.config.ts
4947
- x-pack/solutions/observability/test/api_integration_deployment_agnostic/feature_flag_configs/serverless/oblt.ai_agent.serverless.config.ts
48+
49+
defaultQueue: 'n2-4-spot'
50+
enabled:

.buildkite/ftr_search_serverless_configs.yml

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,6 @@ disabled:
22
# Base config files, only necessary to inform config finding script
33
- x-pack/platform/test/serverless/functional/config.search.base.ts
44

5-
defaultQueue: 'n2-4-spot'
6-
enabled:
75
- x-pack/solutions/search/test/serverless/api_integration/configs/config.ts
86
- x-pack/solutions/search/test/serverless/api_integration/configs/config.feature_flags.ts
97
- x-pack/solutions/search/test/serverless/functional/configs/config.ts
@@ -28,3 +26,6 @@ enabled:
2826
- x-pack/platform/test/serverless/functional/configs/search/config.group11.ts
2927
- x-pack/platform/test/serverless/functional/configs/search/config.group12.ts
3028
- x-pack/platform/test/onechat_api_integration/configs/config.serverless.ts
29+
30+
defaultQueue: 'n2-4-spot'
31+
enabled:

.buildkite/ftr_security_serverless_configs.yml

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,8 +28,6 @@ disabled:
2828
- x-pack/solutions/security/test/serverless/api_integration/configs/config.feature_flags.ts
2929
- x-pack/solutions/security/test/serverless/functional/configs/config.feature_flags.ts
3030

31-
defaultQueue: 'n2-4-spot'
32-
enabled:
3331
- x-pack/solutions/security/test/serverless/api_integration/configs/config.ts
3432
- x-pack/platform/test/serverless/api_integration/configs/security/config.group1.ts
3533
- x-pack/solutions/security/test/serverless/api_integration/test_suites/fleet/config.ts
@@ -144,6 +142,8 @@ enabled:
144142
- x-pack/solutions/security/test/security_solution_api_integration/test_suites/edr_workflows/resolver/trial_license_complete_tier/configs/serverless.config.ts
145143
- x-pack/solutions/security/test/security_solution_api_integration/test_suites/edr_workflows/response_actions/trial_license_complete_tier/configs/serverless.config.ts
146144
- x-pack/solutions/security/test/security_solution_api_integration/test_suites/edr_workflows/spaces/trial_license_complete_tier/configs/serverless.config.ts
145+
- x-pack/solutions/security/test/security_solution_api_integration/test_suites/edr_workflows/role_migrations/search_ai_lake_tier/configs/serverless.config.ts
146+
- x-pack/solutions/security/test/security_solution_api_integration/test_suites/edr_workflows/role_migrations/trial_license_complete_tier/configs/serverless.config.ts
147147
- x-pack/solutions/security/test/security_solution_api_integration/test_suites/siem_migrations/rules/trial_license_complete_tier/configs/serverless.config.ts
148148
- x-pack/solutions/security/test/security_solution_endpoint/configs/serverless.endpoint.config.ts
149149
- x-pack/solutions/security/test/security_solution_endpoint/configs/serverless.integrations.config.ts
@@ -152,3 +152,6 @@ enabled:
152152
# serverless config files that run deployment-agnostic tests
153153
- x-pack/platform/test/spaces_api_integration/deployment_agnostic/security_and_spaces/serverless.config.ts
154154
- x-pack/platform/test/spaces_api_integration/deployment_agnostic/security_and_spaces/serverless.copy_to_space.config.ts
155+
156+
defaultQueue: 'n2-4-spot'
157+
enabled:

.buildkite/ftr_security_stateful_configs.yml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -123,9 +123,7 @@ enabled:
123123
- x-pack/solutions/security/test/security_solution_api_integration/test_suites/edr_workflows/policy/trial_license_complete_tier/configs/ess.config.ts
124124
- x-pack/solutions/security/test/security_solution_api_integration/test_suites/edr_workflows/resolver/trial_license_complete_tier/configs/ess.config.ts
125125
- x-pack/solutions/security/test/security_solution_api_integration/test_suites/edr_workflows/response_actions/trial_license_complete_tier/configs/ess.config.ts
126-
- x-pack/solutions/security/test/security_solution_api_integration/test_suites/edr_workflows/role_migrations/search_ai_lake_tier/configs/serverless.config.ts
127126
- x-pack/solutions/security/test/security_solution_api_integration/test_suites/edr_workflows/role_migrations/trial_license_complete_tier/configs/ess.config.ts
128-
- x-pack/solutions/security/test/security_solution_api_integration/test_suites/edr_workflows/role_migrations/trial_license_complete_tier/configs/serverless.config.ts
129127
- x-pack/solutions/security/test/security_solution_api_integration/test_suites/edr_workflows/spaces/trial_license_complete_tier/configs/ess.config.ts
130128
- x-pack/solutions/security/test/security_solution_api_integration/test_suites/edr_workflows/spaces/trial_license_complete_tier/configs/endpoint_exceptions_moved_ff.ess.config.ts
131129
- x-pack/solutions/security/test/security_solution_api_integration/test_suites/siem_migrations/rules/trial_license_complete_tier/configs/ess.config.ts

.buildkite/ftr_workplace_ai_serverless_configs.yml

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,11 @@ disabled:
66
- x-pack/solutions/workplaceai/test/serverless/functional/configs/config.feature_flags.ts
77
- x-pack/solutions/workplaceai/test/serverless/api_integration/configs/config.feature_flags.ts
88

9-
defaultQueue: 'n2-4-spot'
10-
enabled:
119
- x-pack/solutions/workplaceai/test/serverless/api_integration/configs/config.ts
1210
- x-pack/platform/test/serverless/api_integration/configs/workplaceai/config.group1.ts
1311
- x-pack/solutions/workplaceai/test/serverless/functional/configs/config.ts
1412
- x-pack/platform/test/serverless/functional/configs/workplaceai/config.config_compat_mode.ts
1513
- x-pack/platform/test/serverless/functional/configs/workplaceai/config.group1.ts
14+
15+
defaultQueue: 'n2-4-spot'
16+
enabled:

.buildkite/pipelines/chrome_forward_testing.yml

Lines changed: 0 additions & 182 deletions
Original file line numberDiff line numberDiff line change
@@ -76,118 +76,6 @@ steps:
7676
- exit_status: '*'
7777
limit: 1
7878

79-
- command: .buildkite/scripts/steps/functional/security_serverless_entity_analytics.sh
80-
label: 'Serverless Entity Analytics - Security Cypress Tests'
81-
agents:
82-
machineType: n2-standard-4
83-
preemptible: true
84-
depends_on:
85-
- build
86-
timeout_in_minutes: 60
87-
parallelism: 3
88-
retry:
89-
automatic:
90-
- exit_status: '-1'
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-
machineType: n2-standard-4
97-
preemptible: true
98-
depends_on:
99-
- build
100-
timeout_in_minutes: 60
101-
parallelism: 2
102-
retry:
103-
automatic:
104-
- exit_status: '-1'
105-
limit: 1
106-
107-
- command: .buildkite/scripts/steps/functional/security_serverless_investigations.sh
108-
label: 'Serverless Investigations - Security Solution Cypress Tests'
109-
agents:
110-
machineType: n2-standard-4
111-
preemptible: true
112-
depends_on:
113-
- build
114-
timeout_in_minutes: 60
115-
parallelism: 10
116-
retry:
117-
automatic:
118-
- exit_status: '-1'
119-
limit: 1
120-
121-
- command: .buildkite/scripts/steps/functional/security_serverless_rule_management.sh
122-
label: 'Serverless Rule Management - Security Solution Cypress Tests'
123-
agents:
124-
machineType: n2-standard-4
125-
preemptible: true
126-
depends_on:
127-
- build
128-
timeout_in_minutes: 60
129-
parallelism: 5
130-
retry:
131-
automatic:
132-
- exit_status: '-1'
133-
limit: 1
134-
135-
- command: .buildkite/scripts/steps/functional/security_serverless_rule_management_prebuilt_rules_customization.sh
136-
label: 'Serverless Rule Management - Prebuilt Rules Customization - Security Solution Cypress Tests'
137-
agents:
138-
machineType: n2-standard-4
139-
preemptible: true
140-
depends_on:
141-
- build
142-
timeout_in_minutes: 60
143-
parallelism: 1
144-
retry:
145-
automatic:
146-
- exit_status: '-1'
147-
limit: 1
148-
149-
- command: .buildkite/scripts/steps/functional/security_serverless_rule_management_prebuilt_rules_installation.sh
150-
label: 'Serverless Rule Management - Prebuilt Rules Installation - Security Solution Cypress Tests'
151-
agents:
152-
machineType: n2-standard-4
153-
preemptible: true
154-
depends_on:
155-
- build
156-
timeout_in_minutes: 60
157-
parallelism: 1
158-
retry:
159-
automatic:
160-
- exit_status: '-1'
161-
limit: 1
162-
163-
- command: .buildkite/scripts/steps/functional/security_serverless_rule_management_prebuilt_rules_management.sh
164-
label: 'Serverless Rule Management - Prebuilt Rules Management - Security Solution Cypress Tests'
165-
agents:
166-
machineType: n2-standard-4
167-
preemptible: true
168-
depends_on:
169-
- build
170-
timeout_in_minutes: 60
171-
parallelism: 1
172-
retry:
173-
automatic:
174-
- exit_status: '-1'
175-
limit: 1
176-
177-
- command: .buildkite/scripts/steps/functional/security_serverless_rule_management_prebuilt_rules_upgrade.sh
178-
label: 'Serverless Rule Management - Prebuilt Rules Upgrade - Security Solution Cypress Tests'
179-
agents:
180-
machineType: n2-standard-4
181-
preemptible: true
182-
depends_on:
183-
- build
184-
timeout_in_minutes: 60
185-
parallelism: 1
186-
retry:
187-
automatic:
188-
- exit_status: '-1'
189-
limit: 1
190-
19179
- command: .buildkite/scripts/steps/functional/security_solution_rule_management.sh
19280
label: 'Rule Management - Security Solution Cypress Tests'
19381
agents:
@@ -258,34 +146,6 @@ steps:
258146
- exit_status: '-1'
259147
limit: 1
260148

261-
- command: .buildkite/scripts/steps/functional/security_serverless_detection_engine.sh
262-
label: 'Serverless Detection Engine - Security Solution Cypress Tests'
263-
agents:
264-
machineType: n2-standard-4
265-
preemptible: true
266-
depends_on:
267-
- build
268-
timeout_in_minutes: 60
269-
parallelism: 5
270-
retry:
271-
automatic:
272-
- exit_status: '-1'
273-
limit: 1
274-
275-
- command: .buildkite/scripts/steps/functional/security_serverless_detection_engine_exceptions.sh
276-
label: 'Serverless Detection Engine - Exceptions - Security Solution Cypress Tests'
277-
agents:
278-
machineType: n2-standard-4
279-
preemptible: true
280-
depends_on:
281-
- build
282-
timeout_in_minutes: 60
283-
parallelism: 4
284-
retry:
285-
automatic:
286-
- exit_status: '-1'
287-
limit: 1
288-
289149
- command: .buildkite/scripts/steps/functional/security_solution_detection_engine.sh
290150
label: 'Detection Engine - Security Solution Cypress Tests'
291151
agents:
@@ -314,20 +174,6 @@ steps:
314174
- exit_status: '-1'
315175
limit: 1
316176

317-
- command: .buildkite/scripts/steps/functional/security_serverless_ai_assistant.sh
318-
label: 'Serverless AI Assistant - Security Solution Cypress Tests'
319-
agents:
320-
machineType: n2-standard-4
321-
preemptible: true
322-
depends_on:
323-
- build
324-
timeout_in_minutes: 60
325-
parallelism: 1
326-
retry:
327-
automatic:
328-
- exit_status: '-1'
329-
limit: 1
330-
331177
- command: .buildkite/scripts/steps/functional/security_solution_ai_assistant.sh
332178
label: 'AI Assistant - Security Solution Cypress Tests'
333179
agents:
@@ -398,20 +244,6 @@ steps:
398244
- exit_status: '-1'
399245
limit: 1
400246

401-
- command: .buildkite/scripts/steps/functional/security_serverless_osquery.sh
402-
label: 'Osquery Cypress Tests on Serverless'
403-
agents:
404-
machineType: n2-standard-4
405-
preemptible: true
406-
depends_on:
407-
- build
408-
timeout_in_minutes: 60
409-
parallelism: 8
410-
retry:
411-
automatic:
412-
- exit_status: '-1'
413-
limit: 1
414-
415247
- command: .buildkite/scripts/steps/functional/defend_workflows.sh
416248
label: 'Defend Workflows Cypress Tests'
417249
agents:
@@ -426,20 +258,6 @@ steps:
426258
- exit_status: '-1'
427259
limit: 1
428260

429-
- command: .buildkite/scripts/steps/functional/defend_workflows_serverless.sh
430-
label: 'Defend Workflows Cypress Tests on Serverless'
431-
agents:
432-
enableNestedVirtualization: true
433-
machineType: n2-standard-4
434-
depends_on:
435-
- build
436-
timeout_in_minutes: 60
437-
parallelism: 14
438-
retry:
439-
automatic:
440-
- exit_status: '-1'
441-
limit: 1
442-
443261
- wait: ~
444262
continue_on_failure: true
445263

0 commit comments

Comments
 (0)