Skip to content

Commit b4b9fb6

Browse files
committed
Test opendev watcher master content in CI job
In order to test opendev watcher master content in CI job, this pr adds following thigs: * opendev-master-watcher-operator-pipeline project template which will run meta content provider from master and then Deploy EDPM job watcher-operator-validation-master from mastter content. * It changes the existing job watcher-operator-validation (still deploying the antelope content) with update_containers: false to avoid using meta content provider containers. * It also updates the existing watcher-operator-validation and watcher-operator-kuttl job to use openstack-meta-content-provider-master as a job dependencies. Depends-On: https://review.opendev.org/c/openstack/watcher/+/938893 Signed-off-by: Chandan Kumar (raukadah) <[email protected]>
1 parent a22488f commit b4b9fb6

File tree

1 file changed

+68
-4
lines changed

1 file changed

+68
-4
lines changed

.zuul.yaml

Lines changed: 68 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,24 +2,26 @@
22
- project:
33
name: openstack-k8s-operators/watcher-operator
44
default-branch: main
5+
templates:
6+
- opendev-master-watcher-operator-pipeline
57
github-check:
68
jobs:
79
- noop
810
- watcher-operator-doc-preview
9-
- openstack-meta-content-provider:
10-
vars:
11-
cifmw_operator_build_meta_build: false
1211
- watcher-operator-validation
1312
- watcher-operator-kuttl
1413

1514
- job:
1615
name: watcher-operator-base
16+
override-checkout: main
1717
parent: podified-multinode-edpm-deployment-crc-2comp
18-
dependencies: ["openstack-meta-content-provider"]
18+
dependencies: ["openstack-meta-content-provider-master"]
1919
description: |
2020
A multinode EDPM Zuul job which has one ansible controller, one
2121
extracted crc and two computes. It will be used for testing watcher-operator.
2222
vars:
23+
# To consume containers from meta content provider
24+
cifmw_update_containers_openstack: true
2325
watcher_repo: "{{ ansible_user_dir }}/src/github.com/openstack-k8s-operators/watcher-operator"
2426
watcher_hook: "{{ watcher_repo }}/ci/playbooks/deploy_watcher_service.yaml"
2527
cifmw_install_yamls_whitelisted_vars: &install_yamls_whitelist
@@ -40,9 +42,19 @@
4042
A zuul job to validate the watcher operator and its service deployment.
4143
vars:
4244
run_tempest: false
45+
# Donot use openstack services from meta content provider master
46+
# job.
47+
cifmw_update_containers: false
48+
extra-vars:
49+
# Override zuul meta content provider provided content_provider_dlrn_md5_hash
50+
# var. As returned dlrn md5 hash comes from master release but job is using
51+
# antelope content.
52+
content_provider_dlrn_md5_hash: ''
4353

4454
- job:
4555
name: watcher-operator-kuttl
56+
override-checkout: main
57+
dependencies: ["openstack-meta-content-provider-master"]
4658
parent: cifmw-multinode-kuttl-operator-target
4759
description: |
4860
A zuul job to run watcher operator kuttl tests.
@@ -61,6 +73,11 @@
6173
source: "{{ watcher_hook }}"
6274
extra_vars:
6375
watcher_catalog_image: "{{ content_provider_registry_ip }}:5001/openstack-k8s-operators/watcher-operator-index:{{ zuul.patchset }}"
76+
extra-vars:
77+
# Override zuul meta content provider provided content_provider_dlrn_md5_hash
78+
# var. As returned dlrn md5 hash comes from master release but job is using
79+
# antelope content.
80+
content_provider_dlrn_md5_hash: ''
6481

6582
- job:
6683
name: watcher-operator-doc-preview
@@ -71,3 +88,50 @@
7188
vars:
7289
asciidoc_available: true
7390
doc_available: false
91+
92+
##########################################################
93+
# #
94+
# Master Zuul Jobs #
95+
# #
96+
##########################################################
97+
98+
99+
- job:
100+
name: openstack-meta-content-provider-master
101+
override-checkout: main
102+
description: |
103+
A zuul job building content from OpenDev master release.
104+
parent: openstack-meta-content-provider
105+
vars:
106+
cifmw_operator_build_meta_build: false
107+
cifmw_bop_openstack_release: master
108+
cifmw_bop_dlrn_baseurl: "https://trunk.rdoproject.org/centos9-master"
109+
cifmw_repo_setup_branch: master
110+
111+
- job:
112+
name: watcher-operator-validation-master
113+
parent: watcher-operator-validation
114+
override-checkout: main
115+
description: |
116+
A Zuul job consuming content from openstack-meta-content-provider-master
117+
and deploying EDPM with master content.
118+
dependencies: ["openstack-meta-content-provider-master"]
119+
vars:
120+
cifmw_repo_setup_branch: master
121+
122+
##########################################################
123+
# #
124+
# Project Template #
125+
# #
126+
##########################################################
127+
128+
- project-template:
129+
name: opendev-master-watcher-operator-pipeline
130+
description: |
131+
Project template to run meta content provider and
132+
EDPM job with master opendev and github operator
133+
content.
134+
github-check:
135+
jobs:
136+
- openstack-meta-content-provider-master
137+
- watcher-operator-validation-master

0 commit comments

Comments
 (0)