Skip to content

Commit 40f94f3

Browse files
committed
Skip watcher containers for downstream
Watcher related packages got added in RDO antelope but not available in OSP-18 downstream. openstack-k8s-operators/tcib#215 adds watcher container in tcib. Since downstream tcib jobs install the tcib rpm from main branch so it may break downstream container build and component job. So in order to avoid breakage, we are skip building watcher related containers. Note: It also fixes the exclude conditional to check existence of release key in exclude var to avoid following error: ``` ''dict object'' has no attribute ''master''' ``` Depends-On: openstack-k8s-operators/tcib#215 Signed-off-by: Chandan Kumar <[email protected]>
1 parent 3ca9410 commit 40f94f3

File tree

2 files changed

+10
-1
lines changed

2 files changed

+10
-1
lines changed

roles/build_containers/defaults/main.yml

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -55,3 +55,12 @@ cifmw_build_containers_install_from_source: false
5555
# cifmw_build_containers_dockerfile_labels
5656
# cifmw_build_containers_extra_config
5757
# cifmw_build_containers_build_timeout
58+
59+
# Note(Chandankumar): Remove it once watcher related packages are available downstream.
60+
cifmw_build_containers_exclude_containers:
61+
rhos18:
62+
rhel9:
63+
- watcher-base
64+
- watcher-api
65+
- watcher-applier
66+
- watcher-decision-engine

roles/build_containers/templates/build_containers.sh.j2

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ openstack tcib container image build \
2222
{% if cifmw_build_containers_rhel_modules is defined %}
2323
--rhel-modules {{ cifmw_build_containers_rhel_modules | join(",") }} \
2424
{% endif %}
25-
{% if cifmw_build_containers_exclude_containers is defined %}
25+
{% if cifmw_build_containers_exclude_containers is defined and cifmw_build_containers_openstack_release in cifmw_build_containers_exclude_containers %}
2626
{% set distroversion = cifmw_build_containers_distro + cifmw_build_containers_dist_major_version %}
2727
{% for item in cifmw_build_containers_exclude_containers[cifmw_build_containers_openstack_release][distroversion] %}
2828
--exclude {{ item }} \

0 commit comments

Comments
 (0)