Skip to content

Commit 62e7b07

Browse files
dmlemeshkodmlemeshko
committed
Merge remote-tracking branch 'upstream/main' into ska/relocate-oblt-svl-ftr-tests
2 parents 2e606ae + c2ea6ec commit 62e7b07

1,173 files changed

Lines changed: 8258 additions & 2285 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/pipelines/chrome_forward_testing.yml‎

Lines changed: 90 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -117,15 +117,57 @@ steps:
117117
- exit_status: '-1'
118118
limit: 1
119119

120-
- command: .buildkite/scripts/steps/functional/security_serverless_rule_management_prebuilt_rules.sh
121-
label: 'Serverless Rule Management - Prebuilt Rules - Security Solution Cypress Tests'
120+
- command: .buildkite/scripts/steps/functional/security_serverless_rule_management_prebuilt_rules_customization.sh
121+
label: 'Serverless Rule Management - Prebuilt Rules Customization - Security Solution Cypress Tests'
122122
agents:
123123
machineType: n2-standard-4
124124
preemptible: true
125125
depends_on:
126126
- build
127127
timeout_in_minutes: 60
128-
parallelism: 2
128+
parallelism: 1
129+
retry:
130+
automatic:
131+
- exit_status: '-1'
132+
limit: 1
133+
134+
- command: .buildkite/scripts/steps/functional/security_serverless_rule_management_prebuilt_rules_installation.sh
135+
label: 'Serverless Rule Management - Prebuilt Rules Installation - Security Solution Cypress Tests'
136+
agents:
137+
machineType: n2-standard-4
138+
preemptible: true
139+
depends_on:
140+
- build
141+
timeout_in_minutes: 60
142+
parallelism: 1
143+
retry:
144+
automatic:
145+
- exit_status: '-1'
146+
limit: 1
147+
148+
- command: .buildkite/scripts/steps/functional/security_serverless_rule_management_prebuilt_rules_management.sh
149+
label: 'Serverless Rule Management - Prebuilt Rules Management - Security Solution Cypress Tests'
150+
agents:
151+
machineType: n2-standard-4
152+
preemptible: true
153+
depends_on:
154+
- build
155+
timeout_in_minutes: 60
156+
parallelism: 1
157+
retry:
158+
automatic:
159+
- exit_status: '-1'
160+
limit: 1
161+
162+
- command: .buildkite/scripts/steps/functional/security_serverless_rule_management_prebuilt_rules_upgrade.sh
163+
label: 'Serverless Rule Management - Prebuilt Rules Upgrade - Security Solution Cypress Tests'
164+
agents:
165+
machineType: n2-standard-4
166+
preemptible: true
167+
depends_on:
168+
- build
169+
timeout_in_minutes: 60
170+
parallelism: 1
129171
retry:
130172
automatic:
131173
- exit_status: '-1'
@@ -145,15 +187,57 @@ steps:
145187
- exit_status: '-1'
146188
limit: 1
147189

148-
- command: .buildkite/scripts/steps/functional/security_solution_rule_management_prebuilt_rules.sh
149-
label: 'Rule Management - Prebuilt Rules - Security Solution Cypress Tests'
190+
- command: .buildkite/scripts/steps/functional/security_solution_rule_management_prebuilt_rules_customization.sh
191+
label: 'Rule Management - Prebuilt Rules Customization - Security Solution Cypress Tests'
150192
agents:
151193
machineType: n2-standard-4
152194
preemptible: true
153195
depends_on:
154196
- build
155197
timeout_in_minutes: 60
156-
parallelism: 2
198+
parallelism: 1
199+
retry:
200+
automatic:
201+
- exit_status: '-1'
202+
limit: 1
203+
204+
- command: .buildkite/scripts/steps/functional/security_solution_rule_management_prebuilt_rules_installation.sh
205+
label: 'Rule Management - Prebuilt Rules Installation - Security Solution Cypress Tests'
206+
agents:
207+
machineType: n2-standard-4
208+
preemptible: true
209+
depends_on:
210+
- build
211+
timeout_in_minutes: 60
212+
parallelism: 1
213+
retry:
214+
automatic:
215+
- exit_status: '-1'
216+
limit: 1
217+
218+
- command: .buildkite/scripts/steps/functional/security_solution_rule_management_prebuilt_rules_management.sh
219+
label: 'Rule Management - Prebuilt Rules Management - Security Solution Cypress Tests'
220+
agents:
221+
machineType: n2-standard-4
222+
preemptible: true
223+
depends_on:
224+
- build
225+
timeout_in_minutes: 60
226+
parallelism: 1
227+
retry:
228+
automatic:
229+
- exit_status: '-1'
230+
limit: 1
231+
232+
- command: .buildkite/scripts/steps/functional/security_solution_rule_management_prebuilt_rules_upgrade.sh
233+
label: 'Rule Management - Prebuilt Rules Upgrade - Security Solution Cypress Tests'
234+
agents:
235+
machineType: n2-standard-4
236+
preemptible: true
237+
depends_on:
238+
- build
239+
timeout_in_minutes: 60
240+
parallelism: 1
157241
retry:
158242
automatic:
159243
- exit_status: '-1'

‎.buildkite/pipelines/es_serverless/verify_es_serverless_image.yml‎

Lines changed: 54 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -130,8 +130,8 @@ steps:
130130
- exit_status: '-1'
131131
limit: 1
132132

133-
- command: .buildkite/scripts/steps/functional/security_serverless_rule_management_prebuilt_rules.sh
134-
label: 'Serverless Rule Management - Prebuilt Rules - Security Solution Cypress Tests'
133+
- command: .buildkite/scripts/steps/functional/security_serverless_rule_management_prebuilt_rules_customization.sh
134+
label: 'Serverless Rule Management - Prebuilt Rules Customization - Security Solution Cypress Tests'
135135
if: "build.env('SKIP_CYPRESS') != '1' && build.env('SKIP_CYPRESS') != 'true'"
136136
agents:
137137
image: family/kibana-ubuntu-2004
@@ -141,7 +141,58 @@ steps:
141141
preemptible: true
142142
depends_on: build
143143
timeout_in_minutes: 60
144-
parallelism: 2
144+
parallelism: 1
145+
retry:
146+
automatic:
147+
- exit_status: '-1'
148+
limit: 1
149+
150+
- command: .buildkite/scripts/steps/functional/security_serverless_rule_management_prebuilt_rules_installation.sh
151+
label: 'Serverless Rule Management - Prebuilt Rules Installation - Security Solution Cypress Tests'
152+
if: "build.env('SKIP_CYPRESS') != '1' && build.env('SKIP_CYPRESS') != 'true'"
153+
agents:
154+
image: family/kibana-ubuntu-2004
155+
imageProject: elastic-images-prod
156+
provider: gcp
157+
machineType: n2-standard-4
158+
preemptible: true
159+
depends_on: build
160+
timeout_in_minutes: 60
161+
parallelism: 1
162+
retry:
163+
automatic:
164+
- exit_status: '-1'
165+
limit: 1
166+
167+
- command: .buildkite/scripts/steps/functional/security_serverless_rule_management_prebuilt_rules_management.sh
168+
label: 'Serverless Rule Management - Prebuilt Rules Management - Security Solution Cypress Tests'
169+
if: "build.env('SKIP_CYPRESS') != '1' && build.env('SKIP_CYPRESS') != 'true'"
170+
agents:
171+
image: family/kibana-ubuntu-2004
172+
imageProject: elastic-images-prod
173+
provider: gcp
174+
machineType: n2-standard-4
175+
preemptible: true
176+
depends_on: build
177+
timeout_in_minutes: 60
178+
parallelism: 1
179+
retry:
180+
automatic:
181+
- exit_status: '-1'
182+
limit: 1
183+
184+
- command: .buildkite/scripts/steps/functional/security_serverless_rule_management_prebuilt_rules_upgrade.sh
185+
label: 'Serverless Rule Management - Prebuilt Rules Upgrade - Security Solution Cypress Tests'
186+
if: "build.env('SKIP_CYPRESS') != '1' && build.env('SKIP_CYPRESS') != 'true'"
187+
agents:
188+
image: family/kibana-ubuntu-2004
189+
imageProject: elastic-images-prod
190+
provider: gcp
191+
machineType: n2-standard-4
192+
preemptible: true
193+
depends_on: build
194+
timeout_in_minutes: 60
195+
parallelism: 1
145196
retry:
146197
automatic:
147198
- exit_status: '-1'

‎.buildkite/pipelines/flaky_tests/groups.json‎

Lines changed: 28 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -33,12 +33,36 @@
3333
"name": "[Serverless] Security Solution Rule Management - Cypress"
3434
},
3535
{
36-
"key": "cypress/security_solution_rule_management_prebuilt_rules",
37-
"name": "Security Solution Rule Management - Prebuilt Rules - Cypress"
36+
"key": "cypress/security_solution_rule_management_prebuilt_rules_customization",
37+
"name": "Security Solution Rule Management - Prebuilt Rules Customization - Cypress"
3838
},
3939
{
40-
"key": "cypress/security_serverless_rule_management_prebuilt_rules",
41-
"name": "[Serverless] Security Solution Rule Management - Prebuilt Rules - Cypress"
40+
"key": "cypress/security_serverless_rule_management_prebuilt_rules_customization",
41+
"name": "[Serverless] Security Solution Rule Management - Prebuilt Rules Customization - Cypress"
42+
},
43+
{
44+
"key": "cypress/security_solution_rule_management_prebuilt_rules_installation",
45+
"name": "Security Solution Rule Management - Prebuilt Rules Installation - Cypress"
46+
},
47+
{
48+
"key": "cypress/security_serverless_rule_management_prebuilt_rules_installation",
49+
"name": "[Serverless] Security Solution Rule Management - Prebuilt Rules Installation - Cypress"
50+
},
51+
{
52+
"key": "cypress/security_solution_rule_management_prebuilt_rules_management",
53+
"name": "Security Solution Rule Management - Prebuilt Rules Management - Cypress"
54+
},
55+
{
56+
"key": "cypress/security_serverless_rule_management_prebuilt_rules_management",
57+
"name": "[Serverless] Security Solution Rule Management - Prebuilt Rules Management - Cypress"
58+
},
59+
{
60+
"key": "cypress/security_solution_rule_management_prebuilt_rules_upgrade",
61+
"name": "Security Solution Rule Management - Prebuilt Rules Upgrade - Cypress"
62+
},
63+
{
64+
"key": "cypress/security_serverless_rule_management_prebuilt_rules_upgrade",
65+
"name": "[Serverless] Security Solution Rule Management - Prebuilt Rules Upgrade - Cypress"
4266
},
4367
{
4468
"key": "cypress/security_solution_detection_engine",

‎.buildkite/pipelines/on_merge.yml‎

Lines changed: 95 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -238,16 +238,61 @@ steps:
238238
- exit_status: '-1'
239239
limit: 1
240240

241-
- command: .buildkite/scripts/steps/functional/security_serverless_rule_management_prebuilt_rules.sh
242-
label: 'Serverless Rule Management - Prebuilt Rules - Security Solution Cypress Tests'
241+
- command: .buildkite/scripts/steps/functional/security_serverless_rule_management_prebuilt_rules_customization.sh
242+
label: 'Serverless Rule Management - Prebuilt Rules Customization - Security Solution Cypress Tests'
243243
agents:
244244
image: family/kibana-ubuntu-2004
245245
imageProject: elastic-images-prod
246246
provider: gcp
247247
machineType: n2-standard-4
248248
preemptible: true
249249
timeout_in_minutes: 60
250-
parallelism: 2
250+
parallelism: 1
251+
retry:
252+
automatic:
253+
- exit_status: '-1'
254+
limit: 1
255+
256+
- command: .buildkite/scripts/steps/functional/security_serverless_rule_management_prebuilt_rules_installation.sh
257+
label: 'Serverless Rule Management - Prebuilt Rules Installation - Security Solution Cypress Tests'
258+
agents:
259+
image: family/kibana-ubuntu-2004
260+
imageProject: elastic-images-prod
261+
provider: gcp
262+
machineType: n2-standard-4
263+
preemptible: true
264+
timeout_in_minutes: 60
265+
parallelism: 1
266+
retry:
267+
automatic:
268+
- exit_status: '-1'
269+
limit: 1
270+
271+
- command: .buildkite/scripts/steps/functional/security_serverless_rule_management_prebuilt_rules_management.sh
272+
label: 'Serverless Rule Management - Prebuilt Rules Management - Security Solution Cypress Tests'
273+
agents:
274+
image: family/kibana-ubuntu-2004
275+
imageProject: elastic-images-prod
276+
provider: gcp
277+
machineType: n2-standard-4
278+
preemptible: true
279+
timeout_in_minutes: 60
280+
parallelism: 1
281+
retry:
282+
automatic:
283+
- exit_status: '-1'
284+
limit: 1
285+
286+
- command: .buildkite/scripts/steps/functional/security_serverless_rule_management_prebuilt_rules_upgrade.sh
287+
label: 'Serverless Rule Management - Prebuilt Rules Upgrade - Security Solution Cypress Tests'
288+
agents:
289+
image: family/kibana-ubuntu-2004
290+
imageProject: elastic-images-prod
291+
provider: gcp
292+
machineType: n2-standard-4
293+
preemptible: true
294+
timeout_in_minutes: 60
295+
parallelism: 1
251296
retry:
252297
automatic:
253298
- exit_status: '-1'
@@ -268,8 +313,53 @@ steps:
268313
- exit_status: '-1'
269314
limit: 1
270315

271-
- command: .buildkite/scripts/steps/functional/security_solution_rule_management_prebuilt_rules.sh
272-
label: 'Rule Management - Prebuilt Rules - Security Solution Cypress Tests'
316+
- command: .buildkite/scripts/steps/functional/security_solution_rule_management_prebuilt_rules_customization.sh
317+
label: 'Rule Management - Prebuilt Rules Customization - Security Solution Cypress Tests'
318+
agents:
319+
image: family/kibana-ubuntu-2004
320+
imageProject: elastic-images-prod
321+
provider: gcp
322+
machineType: n2-standard-4
323+
preemptible: true
324+
timeout_in_minutes: 60
325+
parallelism: 2
326+
retry:
327+
automatic:
328+
- exit_status: '-1'
329+
limit: 1
330+
331+
- command: .buildkite/scripts/steps/functional/security_solution_rule_management_prebuilt_rules_installation.sh
332+
label: 'Rule Management - Prebuilt Rules Installation - Security Solution Cypress Tests'
333+
agents:
334+
image: family/kibana-ubuntu-2004
335+
imageProject: elastic-images-prod
336+
provider: gcp
337+
machineType: n2-standard-4
338+
preemptible: true
339+
timeout_in_minutes: 60
340+
parallelism: 2
341+
retry:
342+
automatic:
343+
- exit_status: '-1'
344+
limit: 1
345+
346+
- command: .buildkite/scripts/steps/functional/security_solution_rule_management_prebuilt_rules_management.sh
347+
label: 'Rule Management - Prebuilt Rules Management - Security Solution Cypress Tests'
348+
agents:
349+
image: family/kibana-ubuntu-2004
350+
imageProject: elastic-images-prod
351+
provider: gcp
352+
machineType: n2-standard-4
353+
preemptible: true
354+
timeout_in_minutes: 60
355+
parallelism: 2
356+
retry:
357+
automatic:
358+
- exit_status: '-1'
359+
limit: 1
360+
361+
- command: .buildkite/scripts/steps/functional/security_solution_rule_management_prebuilt_rules_upgrade.sh
362+
label: 'Rule Management - Prebuilt Rules Upgrade - Security Solution Cypress Tests'
273363
agents:
274364
image: family/kibana-ubuntu-2004
275365
imageProject: elastic-images-prod

0 commit comments

Comments
 (0)