Skip to content

test: explicitly process bootc templates #6486

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

Open
copejon wants to merge 1 commit into
base: main
Choose a base branch
from
Open

test: explicitly process bootc templates #6486

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
11 changes: 11 additions & 0 deletions test/bin/pyutils/build_bootc_images.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -658,6 +658,17 @@ def main():
ofile = os.path.join(BOOTC_IMAGE_DIR, ifile)
ifile = os.path.join(ipkgdir, ifile)
run_template_cmd(ifile, ofile, args.dry_run)
# Process shared bootc templates (USHIFT-6788)
Copy link
Copy Markdown
Contributor

@ggiguash ggiguash Apr 10, 2026

Choose a reason for hiding this comment

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

Please remove the issue ID from the comment. We do not usually do this unless it's a TODO item.

tpldir = f"{SCRIPTDIR}/../image-blueprints-bootc/templates"
if os.path.isdir(tpldir):
Copy link
Copy Markdown
Contributor

@ggiguash ggiguash Apr 10, 2026

Choose a reason for hiding this comment

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

This code is almost a duplicate of a block from process_group function.
Let's refactor it into process_template_files and call from both places?

for ifile in os.listdir(tpldir):
if not ifile.endswith(".template"):
continue
ofile = os.path.join(BOOTC_IMAGE_DIR, ifile.removesuffix(".template"))
if os.path.exists(ofile) and not FORCE_REBUILD:
continue
ifile = os.path.join(tpldir, ifile)
run_template_cmd(ifile, ofile, args.dry_run)
# Run the mirror registry
common.run_command([f"{SCRIPTDIR}/mirror_registry.sh"], args.dry_run)
# Skip all image builds
Expand Down