Skip to content

Commit c1ea3c3

Browse files
raukadahopenshift-merge-bot[bot]
authored andcommitted
Repurpose periodic watcher validation job to test cs10 master containers
With openstack-k8s-operators#159 (comment), CS10 EDPM POC job is now working with tls. https://review.rdoproject.org/r/c/rdo-jobs/+/57650 pushes containers with current tag in master integration line. Let's reuse this line to test cs10 master current containers. Depends-On: openstack-k8s-operators/ci-framework#2967 Resolves: https://issues.redhat.com//browse/OSPRH-16721 Signed-off-by: Chandan Kumar (raukadah) <raukadah@gmail.com>
1 parent 7cc19c1 commit c1ea3c3

File tree

1 file changed

+12
-5
lines changed

1 file changed

+12
-5
lines changed

.zuul.yaml

Lines changed: 12 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@
3535
description: |
3636
A multinode EDPM Zuul job which has one ansible controller, one
3737
extracted crc and two computes. It will be used for testing watcher
38-
in the master promotion RDO pipeline.
38+
in the master promotion RDO pipeline with CentOS Stream 10 content.
3939
vars:
4040
cifmw_repo_setup_branch: master
4141
cifmw_repo_setup_promotion: podified-ci-testing
@@ -52,9 +52,17 @@
5252
src_dir }}/ci/scenarios/edpm.yml"
5353
- "@{{ ansible_user_dir }}/{{ zuul.projects['github.com/openstack-k8s-operators/watcher-operator'].
5454
src_dir }}/ci/tests/watcher-master.yml"
55-
fetch_dlrn_hash: true
56-
watcher_dlrn_tag: "{{ cifmw_repo_setup_promotion }}"
57-
watcher_registry_url: quay.rdoproject.org/podified-master-centos9
55+
fetch_dlrn_hash: false
56+
# Note(chandankumar): It tests cs10 master container current tag build from
57+
# DLRN current.
58+
watcher_dlrn_tag: current
59+
watcher_registry_url: quay.rdoproject.org/podified-master-centos10
60+
cifmw_update_containers_registry: "{{ watcher_registry_url | split('/') | first }}"
61+
cifmw_update_containers_tag: current
62+
cifmw_update_containers_org: "{{ watcher_registry_url | split('/') | last }}"
63+
cifmw_test_operator_tempest_image_tag: current
64+
cifmw_test_operator_tempest_registry: "{{ cifmw_update_containers_registry }}"
65+
cifmw_test_operator_tempest_namespace: "{{ cifmw_update_containers_org }}"
5866

5967
- job:
6068
name: watcher-operator-validation-base
@@ -292,7 +300,6 @@
292300
- ^setup.cfg$
293301
- ^tools/.*$
294302
- ^tox.ini$
295-
- ^.zuul.yaml
296303
# Build watcher-operator always in meta content provider
297304
vars:
298305
cifmw_operator_build_operators:

0 commit comments

Comments
 (0)