Skip to content

Commit 97b8da4

Browse files
authored
Enables validation runs of chargeback jobs in branches other than "main" (#343)
- Currently, the regex(s) for files are not correct for logging and chargeback jobs - Improve regex to improve robustness of yaml files with usage of "^" and "&" - Removed "override-checkout: main" So, zuul will run PR code not "main" Assisted by Claude
1 parent 7b4dc26 commit 97b8da4

1 file changed

Lines changed: 15 additions & 16 deletions

File tree

.zuul.yaml

Lines changed: 15 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -190,12 +190,11 @@
190190
override-checkout: main
191191
- functional-chargeback-tests-osp18:
192192
files:
193-
- roles/telemetry_chargeback/*
194-
- ci/vars-cloudkitty-fvt.yml
195-
- roles/common/*
196-
- ci/report_result.yml
197-
- .zuul.yaml
198-
override-checkout: main
193+
- ^roles/telemetry_chargeback/.*$
194+
- ^roles/common/.*$
195+
- ^ci/vars-cloudkitty-fvt.yml$
196+
- ^ci/report_result.yml$
197+
- ^.zuul.yaml$
199198
dependencies:
200199
- telemetry-openstack-meta-content-provider-master
201200
- feature-verification-tests-noop:
@@ -204,19 +203,19 @@
204203
- functional-logging-tests-osp18:
205204
irrelevant-files: *irrelevant_files
206205
files:
207-
- roles/telemetry_logging/.*
208-
- roles/common/*
209-
- ci/vars-logging-test.yml
210-
- ci/logging_tests_all.yml
211-
- ci/logging_tests_computes.yml
212-
- ci/logging_tests_controller.yml
213-
- ci/report_result.yml
214-
- .zuul.yaml
206+
- ^roles/telemetry_logging/.*$
207+
- ^roles/common/.*$
208+
- ^ci/vars-logging-test.yml$
209+
- ^ci/logging_tests_all.yml$
210+
- ^ci/logging_tests_computes.yml$
211+
- ^ci/logging_tests_controller.yml$
212+
- ^ci/report_result.yml$
213+
- ^.zuul.yaml$
215214
- functional-periodic-telemetry-with-ceph:
216215
files:
217216
# Run this job for changes to the volume_pool_metrics test changes as this is
218217
# the only job, where those tests get executed and for changes to zuul.yaml in
219218
# case the job definition changes.
220-
- roles/telemetry_verify_metrics/tasks/verify_ceilometer_volume_pool_metrics.yml
221-
- .zuul.yaml
219+
- ^roles/telemetry_verify_metrics/tasks/verify_ceilometer_volume_pool_metrics.yml$
220+
- ^.zuul.yaml$
222221

0 commit comments

Comments
 (0)