Skip to content

[release-4.22] USHIFT-6788: explicitly process bootc templates #6513

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

Merged
openshift-merge-bot merged 3 commits into from
Apr 16, 2026
Merged

[release-4.22] USHIFT-6788: explicitly process bootc templates #6513

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
c206bf8
explicitly process bootc templates
copejon Apr 8, 2026
3f34ed1
Refactor bootc template expansion into process_template_files
copejon Apr 14, 2026
729b6ea
dropped edge case handling because templates are a) hardcoded, thus n…
copejon Apr 15, 2026
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
23 changes: 14 additions & 9 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 @@ -218,6 +218,16 @@ def run_template_cmd(ifile, ofile, dry_run):
common.run_command_in_shell(gomplate_args, dry_run)


def process_template_files(tpldir, dry_run):
"""Expand *.template files under tpldir into BOOTC_IMAGE_DIR via gomplate."""
for name in os.listdir(tpldir):
if not name.endswith(".template"):
continue
ofile = os.path.join(BOOTC_IMAGE_DIR, name.removesuffix(".template"))
ifile = os.path.join(tpldir, name)
run_template_cmd(ifile, ofile, dry_run)


def get_process_file_names(idir, ifile, obasedir):
path = os.path.join(idir, ifile)
outname = os.path.splitext(ifile)[0]
Expand Down Expand Up @@ -518,15 +528,7 @@ def process_group(groupdir, build_type, pattern="*", dry_run=False):
common.start_junit(groupdir)
# Process all the template files in the current group directory
# before starting the parallel processing
for ifile in os.listdir(groupdir):
if not ifile.endswith(".template"):
continue
# Create full path for output and input file names
ofile = os.path.join(BOOTC_IMAGE_DIR, ifile)
ifile = os.path.join(groupdir, ifile)
# Strip the .template suffix from the output file name
ofile = ofile.removesuffix(".template")
run_template_cmd(ifile, ofile, dry_run)
process_template_files(groupdir, dry_run)

# Parallel processing loop
with concurrent.futures.ProcessPoolExecutor() as executor:
Expand Down Expand Up @@ -658,6 +660,9 @@ def main():
ofile = os.path.join(BOOTC_IMAGE_DIR, ifile)
ifile = os.path.join(ipkgdir, ifile)
run_template_cmd(ifile, ofile, args.dry_run)

tpldir = os.path.join(SCRIPTDIR, "..", "image-blueprints-bootc", "templates")
process_template_files(tpldir, args.dry_run)
# Run the mirror registry
common.run_command([f"{SCRIPTDIR}/mirror_registry.sh"], args.dry_run)
# Skip all image builds
Expand Down