Skip to content

Commit 184078f

Browse files
amoralejopenshift-merge-bot[bot]
authored andcommitted
[18.0-fr6] Drop Zuul Pragma config
Also, it forces to use ci-framework from main branch.
1 parent 18c855a commit 184078f

1 file changed

Lines changed: 9 additions & 18 deletions

File tree

.zuul.yaml

Lines changed: 9 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,10 @@
1010
jobs:
1111
- noop
1212
- watcher-operator-doc-preview
13-
- watcher-operator-kuttl
13+
- watcher-operator-kuttl:
14+
required-projects: &cifmw_main
15+
- name: openstack-k8s-operators/ci-framework
16+
override-checkout: main
1417

1518
- job:
1619
name: watcher-operator-base
@@ -20,6 +23,7 @@
2023
A multinode EDPM Zuul job which has one ansible controller, one
2124
extracted crc and two computes. It will be used for testing watcher-operator.
2225
Configures Nova and Cinder to send notifications over a dedicated rabbitmq instance.
26+
required-projects: *cifmw_main
2327
vars:
2428
watcher_scenario: "edpm"
2529
cifmw_extras:
@@ -280,21 +284,6 @@
280284
# antelope content.
281285
content_provider_dlrn_md5_hash: ''
282286

283-
##########################################################
284-
# #
285-
# Zuul Pragma to alter Zuul Config #
286-
# #
287-
##########################################################
288-
289-
# Note(Chandan Kumar): Keep Zuul Pragma config only in
290-
# main branch. Whenever we create FR* branch, We should
291-
# delete Pragma config manually from FR* branch.
292-
- pragma:
293-
implied-branch-matchers: True
294-
implied-branches:
295-
- master
296-
- main
297-
298287
##########################################################
299288
# #
300289
# Project Template #
@@ -305,14 +294,16 @@
305294
name: opendev-master-watcher-operator-pipeline
306295
github-check:
307296
jobs:
308-
- openstack-meta-content-provider-master
297+
- openstack-meta-content-provider-master:
298+
required-projects: *cifmw_main
309299
- watcher-operator-validation-master
310300

311301
- project-template:
312302
name: opendev-epoxy-watcher-operator-pipeline
313303
github-check:
314304
jobs:
315-
- openstack-meta-content-provider-epoxy
305+
- openstack-meta-content-provider-epoxy:
306+
required-projects: *cifmw_main
316307
- watcher-operator-validation-epoxy
317308
- watcher-operator-validation-epoxy-ocp4-18
318309

0 commit comments

Comments
 (0)