Skip to content

Commit 76fecc9

Browse files
raukadahopenshift-merge-bot[bot]
authored andcommitted
Port CS10 master github-check job to cs10
Based on #159 (comment), meta content provider is working on CS10. This pr ports the same to CS10. Resolves: OSPRH-16773 Signed-off-by: Chandan Kumar (raukadah) <[email protected]>
1 parent 36201be commit 76fecc9

File tree

1 file changed

+31
-6
lines changed

1 file changed

+31
-6
lines changed

.zuul.yaml

Lines changed: 31 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -219,15 +219,28 @@
219219
- job:
220220
name: openstack-meta-content-provider-master
221221
description: |
222-
A zuul job building content from OpenDev master release.
222+
A zuul job building content from OpenDev master release on CentOS Stream 10.
223+
nodeset: centos-stream-10-vexxhost
223224
parent: openstack-meta-content-provider
224225
vars:
225-
cifmw_operator_build_meta_build: false
226226
cifmw_bop_openstack_release: master
227-
cifmw_bop_dlrn_baseurl: "https://trunk.rdoproject.org/centos9-master"
227+
cifmw_operator_build_meta_build: false
228+
cifmw_bop_dlrn_baseurl: "https://trunk.rdoproject.org/centos10-master"
228229
cifmw_repo_setup_branch: master
229-
cifmw_build_containers_registry_namespace: podified-master-centos9
230-
230+
cifmw_build_containers_registry_namespace: podified-master-centos10
231+
cifmw_build_containers_containers_base_image: quay.io/centos/centos:stream10
232+
cifmw_repo_setup_promotion: current
233+
cifmw_repo_setup_dist_major_version: 10
234+
cifmw_build_containers_force: true
235+
cifmw_build_containers_image_tag: watcher_latest
236+
cifmw_bop_initial_dlrn_config: centos10-stream
237+
cifmw_bop_dlrn_target: centos10-stream
238+
cifmw_bop_dlrn_from_source: true
239+
cifmw_operator_build_operators:
240+
- name: watcher-operator
241+
src: "{{ ansible_user_dir }}/src/github.com/openstack-k8s-operators/watcher-operator"
242+
- name: openstack-operator
243+
src: "{{ ansible_user_dir }}/src/github.com/openstack-k8s-operators/openstack-operator"
231244
- job:
232245
name: watcher-operator-validation-master
233246
parent: watcher-operator-validation-base
@@ -242,7 +255,19 @@
242255
cifmw_repo_setup_branch: master
243256
# To consume containers from meta content provider
244257
cifmw_update_containers_openstack: true
245-
cifmw_update_containers_org: podified-master-centos9
258+
cifmw_update_containers_org: podified-master-centos10
259+
fetch_dlrn_hash: false
260+
watcher_services_tag: watcher_latest
261+
watcher_registry_url: "{{ content_provider_os_registry_url }}"
262+
cifmw_update_containers_tag: watcher_latest
263+
cifmw_update_containers_registry: "{{ content_provider_os_registry_url | split('/') | first }}"
264+
cifmw_test_operator_tempest_image_tag: watcher_latest
265+
266+
extra-vars:
267+
# Override zuul meta content provider provided content_provider_dlrn_md5_hash
268+
# var. As returned dlrn md5 hash comes from master release but job is using
269+
# antelope content.
270+
content_provider_dlrn_md5_hash: ''
246271

247272
##########################################################
248273
# #

0 commit comments

Comments
 (0)