Skip to content

Commit 5c1defc

Browse files
nikitaindikCAWilson94
nikitaindik
authored and
CAWilson94
committed
[Security Solution] Fix MKI pipeline after splitting Rule Management tests (elastic#235729)
Pipeline with the fix passing in MKI: https://buildkite.com/elastic/kibana-serverless-security-solution-quality-gate-rule-management/builds/3397 ## Summary This PR is a follow up to PR elastic#234930 and fixes `ERROR Unable to find config file`. This error occurs when running Rule Management API integration tests in MKI pipelines ([example](https://buildkite.com/elastic/kibana-serverless-security-solution-quality-gate-rule-management/builds/3393#01996093-11c2-4107-84e3-7f0b61565cc7)). ## What causes the error PR elastic#234930 split one of the FTR config files into 3 smaller files, but didn't split the corresponding npm script in [package.json](https://github.com/elastic/kibana/blob/main/x-pack/solutions/security/test/security_solution_api_integration/package.json). ## Changes - Added npm scripts to run new test configs in periodic and quality gate pipelines - Updated pipeline YMLs to use these new scripts - Removed unused npm scripts to run configs locally. We normally test locally by running `./x-pack/scripts/functional_tests_server --config=<something>`.
1 parent 1c4fcb5 commit 5c1defc

File tree

3 files changed

+71
-13
lines changed

3 files changed

+71
-13
lines changed

‎.buildkite/pipelines/security_solution_quality_gate/mki_periodic/mki_periodic_rule_management.yml‎

Lines changed: 31 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -215,9 +215,37 @@ steps:
215215
- exit_status: '1'
216216
limit: 2
217217

218-
- label: 'API MKI - prebuilt_rules_management:customization_enabled:qa:serverless'
219-
command: .buildkite/scripts/pipelines/security_solution_quality_gate/api_integration/api-integration-tests.sh prebuilt_rules_management:customization_enabled:qa:serverless
220-
key: prebuilt_rules_management:customization_enabled:qa:serverless
218+
- label: 'API MKI - prebuilt_rules_management:customization_enabled:customization:qa:serverless'
219+
command: .buildkite/scripts/pipelines/security_solution_quality_gate/api_integration/api-integration-tests.sh prebuilt_rules_management:customization_enabled:customization:qa:serverless
220+
key: prebuilt_rules_management:customization_enabled:customization:qa:serverless
221+
agents:
222+
image: family/kibana-ubuntu-2404
223+
imageProject: elastic-images-prod
224+
provider: gcp
225+
machineType: n2-standard-4
226+
timeout_in_minutes: 120
227+
retry:
228+
automatic:
229+
- exit_status: '1'
230+
limit: 2
231+
232+
- label: 'API MKI - prebuilt_rules_management:customization_enabled:upgrade_prebuilt_rules:qa:serverless'
233+
command: .buildkite/scripts/pipelines/security_solution_quality_gate/api_integration/api-integration-tests.sh prebuilt_rules_management:customization_enabled:upgrade_prebuilt_rules:qa:serverless
234+
key: prebuilt_rules_management:customization_enabled:upgrade_prebuilt_rules:qa:serverless
235+
agents:
236+
image: family/kibana-ubuntu-2404
237+
imageProject: elastic-images-prod
238+
provider: gcp
239+
machineType: n2-standard-4
240+
timeout_in_minutes: 120
241+
retry:
242+
automatic:
243+
- exit_status: '1'
244+
limit: 2
245+
246+
- label: 'API MKI - prebuilt_rules_management:customization_enabled:upgrade_notifications:qa:serverless'
247+
command: .buildkite/scripts/pipelines/security_solution_quality_gate/api_integration/api-integration-tests.sh prebuilt_rules_management:customization_enabled:upgrade_notifications:qa:serverless
248+
key: prebuilt_rules_management:customization_enabled:upgrade_notifications:qa:serverless
221249
agents:
222250
image: family/kibana-ubuntu-2404
223251
imageProject: elastic-images-prod

‎.buildkite/pipelines/security_solution_quality_gate/mki_quality_gate/mki_quality_gate_rule_management.yml‎

Lines changed: 31 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -117,9 +117,37 @@ steps:
117117
- exit_status: '1'
118118
limit: 2
119119

120-
- label: 'API MKI - prebuilt_rules_management:customization_enabled:qa:serverless:release'
121-
command: .buildkite/scripts/pipelines/security_solution_quality_gate/api_integration/api-integration-tests.sh prebuilt_rules_management:customization_enabled:qa:serverless:release
122-
key: prebuilt_rules_management:customization_enabled:qa:serverless:release
120+
- label: 'API MKI - prebuilt_rules_management:customization_enabled:customization:qa:serverless:release'
121+
command: .buildkite/scripts/pipelines/security_solution_quality_gate/api_integration/api-integration-tests.sh prebuilt_rules_management:customization_enabled:customization:qa:serverless:release
122+
key: prebuilt_rules_management:customization_enabled:customization:qa:serverless:release
123+
agents:
124+
image: family/kibana-ubuntu-2404
125+
imageProject: elastic-images-prod
126+
provider: gcp
127+
machineType: n2-standard-4
128+
timeout_in_minutes: 120
129+
retry:
130+
automatic:
131+
- exit_status: '1'
132+
limit: 2
133+
134+
- label: 'API MKI - prebuilt_rules_management:customization_enabled:upgrade_prebuilt_rules:qa:serverless:release'
135+
command: .buildkite/scripts/pipelines/security_solution_quality_gate/api_integration/api-integration-tests.sh prebuilt_rules_management:customization_enabled:upgrade_prebuilt_rules:qa:serverless:release
136+
key: prebuilt_rules_management:customization_enabled:upgrade_prebuilt_rules:qa:serverless:release
137+
agents:
138+
image: family/kibana-ubuntu-2404
139+
imageProject: elastic-images-prod
140+
provider: gcp
141+
machineType: n2-standard-4
142+
timeout_in_minutes: 120
143+
retry:
144+
automatic:
145+
- exit_status: '1'
146+
limit: 2
147+
148+
- label: 'API MKI - prebuilt_rules_management:customization_enabled:upgrade_notifications:qa:serverless:release'
149+
command: .buildkite/scripts/pipelines/security_solution_quality_gate/api_integration/api-integration-tests.sh prebuilt_rules_management:customization_enabled:upgrade_notifications:qa:serverless:release
150+
key: prebuilt_rules_management:customization_enabled:upgrade_notifications:qa:serverless:release
123151
agents:
124152
image: family/kibana-ubuntu-2404
125153
imageProject: elastic-images-prod

‎x-pack/solutions/security/test/security_solution_api_integration/package.json‎

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -434,20 +434,22 @@
434434
"rule_patch:essentials:qa:serverless:release": "npm run run-tests:rm:basic_essentials rule_patch serverless qaEnv",
435435
"rule_patch:basic:server:ess": "npm run initialize-server:rm:basic_essentials rule_patch ess",
436436
"rule_patch:basic:runner:ess": "npm run run-tests:rm:basic_essentials rule_patch ess essEnv",
437-
437+
438438
"prebuilt_rules_management:customization_disabled:server:serverless": "npm run initialize-server:rm:prebuilt_rules:customization_disabled . serverless_essentials_tier",
439439
"prebuilt_rules_management:customization_disabled:runner:serverless": "npm run run-tests:rm:prebuilt_rules:customization_disabled . serverless_essentials_tier serverlessEnv",
440440
"prebuilt_rules_management:customization_disabled:qa:serverless": "npm run run-tests:rm:prebuilt_rules:customization_disabled . serverless_essentials_tier qaPeriodicEnv",
441441
"prebuilt_rules_management:customization_disabled:qa:serverless:release": "npm run run-tests:rm:prebuilt_rules:customization_disabled . serverless_essentials_tier qaEnv",
442442
"prebuilt_rules_management:customization_disabled:server:ess": "npm run initialize-server:rm:prebuilt_rules:customization_disabled . ess_basic_license",
443443
"prebuilt_rules_management:customization_disabled:runner:ess": "npm run run-tests:rm:prebuilt_rules:customization_disabled . ess_basic_license essEnv",
444444

445-
"prebuilt_rules_management:customization_enabled:server:serverless": "npm run initialize-server:rm:prebuilt_rules:customization_enabled . serverless",
446-
"prebuilt_rules_management:customization_enabled:runner:serverless": "npm run run-tests:rm:prebuilt_rules:customization_enabled . serverless serverlessEnv",
447-
"prebuilt_rules_management:customization_enabled:qa:serverless": "npm run run-tests:rm:prebuilt_rules:customization_enabled . serverless qaPeriodicEnv",
448-
"prebuilt_rules_management:customization_enabled:qa:serverless:release": "npm run run-tests:rm:prebuilt_rules:customization_enabled . serverless qaEnv",
449-
"prebuilt_rules_management:customization_enabled:server:ess": "npm run initialize-server:rm:prebuilt_rules:customization_enabled . ess",
450-
"prebuilt_rules_management:customization_enabled:runner:ess": "npm run run-tests:rm:prebuilt_rules:customization_enabled . ess essEnv",
445+
"prebuilt_rules_management:customization_enabled:customization:qa:serverless": "npm run run-tests:rm:prebuilt_rules:customization_enabled customization serverless qaPeriodicEnv",
446+
"prebuilt_rules_management:customization_enabled:customization:qa:serverless:release": "npm run run-tests:rm:prebuilt_rules:customization_enabled customization serverless qaEnv",
447+
448+
"prebuilt_rules_management:customization_enabled:upgrade_prebuilt_rules:qa:serverless": "npm run run-tests:rm:prebuilt_rules:customization_enabled upgrade_prebuilt_rules serverless qaPeriodicEnv",
449+
"prebuilt_rules_management:customization_enabled:upgrade_prebuilt_rules:qa:serverless:release": "npm run run-tests:rm:prebuilt_rules:customization_enabled upgrade_prebuilt_rules serverless qaEnv",
450+
451+
"prebuilt_rules_management:customization_enabled:upgrade_notifications:qa:serverless": "npm run run-tests:rm:prebuilt_rules:customization_enabled upgrade_notifications serverless qaPeriodicEnv",
452+
"prebuilt_rules_management:customization_enabled:upgrade_notifications:qa:serverless:release": "npm run run-tests:rm:prebuilt_rules:customization_enabled upgrade_notifications serverless qaEnv",
451453

452454
"prebuilt_rules_upgrade_common_fields:customization_enabled:server:serverless": "npm run initialize-server:rm:prebuilt_rules:customization_enabled upgrade_prebuilt_rules/diffable_rule_fields/common_fields serverless",
453455
"prebuilt_rules_upgrade_common_fields:customization_enabled:runner:serverless": "npm run run-tests:rm:prebuilt_rules:customization_enabled upgrade_prebuilt_rules/diffable_rule_fields/common_fields serverless serverlessEnv",

0 commit comments

Comments
 (0)