Skip to content

Skip watcher containers for downstream #2515

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 1 commit into from
Closed

Skip watcher containers for downstream #2515

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 9 additions & 0 deletions roles/build_containers/defaults/main.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,3 +55,12 @@ cifmw_build_containers_install_from_source: false
# cifmw_build_containers_dockerfile_labels
# cifmw_build_containers_extra_config
# cifmw_build_containers_build_timeout

# Note(Chandankumar): Remove it once watcher related packages are available downstream.
cifmw_build_containers_exclude_containers:
Copy link

@lewisdenny lewisdenny Nov 6, 2024 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Rather than defining this temporary list in the role defaults, can it be set in the job variables of the D/S job that calls the role.

Copy link
Contributor Author

@raukadah raukadah Nov 6, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thank you @lewisdenny for the review, I have proposed a mr downstream to achieve the same.

Copy link

@lewisdenny lewisdenny Nov 6, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

cifmw_build_containers_exclude_containers is documented in the README as a list but in fact it's a nested dictionary.

Copy link
Contributor Author

@raukadah raukadah Nov 6, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Good finding, I will update this pull request to address this change and remove watcher skip from here. thank you!

rhos18:
rhel9:
- watcher-base
- watcher-api
- watcher-applier
- watcher-decision-engine
2 changes: 1 addition & 1 deletion roles/build_containers/templates/build_containers.sh.j2
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ openstack tcib container image build \
{% if cifmw_build_containers_rhel_modules is defined %}
--rhel-modules {{ cifmw_build_containers_rhel_modules | join(",") }} \
{% endif %}
{% if cifmw_build_containers_exclude_containers is defined %}
{% if cifmw_build_containers_exclude_containers is defined and cifmw_build_containers_openstack_release in cifmw_build_containers_exclude_containers %}
{% set distroversion = cifmw_build_containers_distro + cifmw_build_containers_dist_major_version %}
{% for item in cifmw_build_containers_exclude_containers[cifmw_build_containers_openstack_release][distroversion] %}
--exclude {{ item }} \
Expand Down