Skip to content

USHIFT-6715: Enable building multiple bootc blueprint layers in parallel#6489

Open
vanhalenar wants to merge 7 commits intoopenshift:mainfrom
vanhalenar:build_bootc_upgrades
Open

USHIFT-6715: Enable building multiple bootc blueprint layers in parallel#6489
vanhalenar wants to merge 7 commits intoopenshift:mainfrom
vanhalenar:build_bootc_upgrades

Conversation

@vanhalenar
Copy link
Copy Markdown
Contributor

@vanhalenar vanhalenar commented Apr 10, 2026

Summary by CodeRabbit

  • New Features

    • Build system now supports processing multiple layer directories in a single invocation via comma-separated paths.
    • Added per-OS layer selection for combined OS builds.
    • Introduced release-specific layer build handling in CI.
  • Chores

    • Enhanced layer directory validation with explicit existence checks.

@openshift-ci
Copy link
Copy Markdown
Contributor

openshift-ci bot commented Apr 10, 2026

Skipping CI for Draft Pull Request.
If you want CI signal for your change, please convert it to an actual PR.
You can still manually trigger a test run with /test all

@openshift-ci-robot openshift-ci-robot added the jira/valid-reference Indicates that this PR references a valid Jira ticket of any type. label Apr 10, 2026
@openshift-ci openshift-ci bot added the do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. label Apr 10, 2026
@openshift-ci-robot
Copy link
Copy Markdown

openshift-ci-robot commented Apr 10, 2026

@vanhalenar: This pull request references USHIFT-6715 which is a valid jira issue.

Warning: The referenced jira issue has an invalid target version for the target branch this PR targets: expected the task to target the "4.22.0" version, but no target version was set.

Details

In response to this:

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the openshift-eng/jira-lifecycle-plugin repository.

@coderabbitai
Copy link
Copy Markdown

coderabbitai bot commented Apr 10, 2026

No actionable comments were generated in the recent review. 🎉

ℹ️ Recent review info
⚙️ Run configuration

Configuration used: Repository YAML (base), Central YAML (inherited)

Review profile: CHILL

Plan: Pro Plus

Run ID: b31684c6-5bd9-487e-8727-db8c4b078430

📥 Commits

Reviewing files that changed from the base of the PR and between 2e00a33 and 194e259.

📒 Files selected for processing (29)
  • test/bin/ci_phase_iso_build.sh
  • test/bin/pyutils/build_bootc_images.py
  • test/image-blueprints-bootc/el10/layer1-base/group1/rhel102-test-agent.containerfile
  • test/image-blueprints-bootc/el10/layer1-base/group2/rhel102-bootc-crel-isolated.containerfile
  • test/image-blueprints-bootc/el10/layer1-base/group2/rhel102-bootc-crel-optionals.containerfile
  • test/image-blueprints-bootc/el10/layer1-base/group2/rhel102-bootc-crel.containerfile
  • test/image-blueprints-bootc/el10/layer1-base/group2/rhel102-bootc.image-bootc
  • test/image-blueprints-bootc/el10/layer4-release/group1/rhel102-bootc-brew-lrel-optional.containerfile
  • test/image-blueprints-bootc/el10/layer4-release/group1/rhel102-bootc-brew-nightly-with-optional.containerfile
  • test/image-blueprints-bootc/el10/layer4-release/group1/rhel102-bootc-brew.containerfile
  • test/image-blueprints-bootc/el10/layer4-release/group2/rhel102-bootc-brew-lrel-fips.containerfile
  • test/image-blueprints-bootc/el10/layer4-release/group2/rhel102-bootc-brew-lrel-optional.image-bootc
  • test/image-blueprints-bootc/el10/layer4-release/group2/rhel102-bootc-brew-lrel-tuned.containerfile
  • test/image-blueprints-bootc/el9/layer1-base/group1/rhel96-test-agent.containerfile
  • test/image-blueprints-bootc/el9/layer1-base/group1/rhel98-test-agent.containerfile
  • test/image-blueprints-bootc/el9/layer1-base/group2/rhel96-bootc-prel.containerfile
  • test/image-blueprints-bootc/el9/layer1-base/group2/rhel96-bootc-yminus2.containerfile
  • test/image-blueprints-bootc/el9/layer1-base/group2/rhel96-bootc.image-bootc
  • test/image-blueprints-bootc/el9/layer1-base/group2/rhel98-bootc-crel-isolated.containerfile
  • test/image-blueprints-bootc/el9/layer1-base/group2/rhel98-bootc-crel-optionals.containerfile
  • test/image-blueprints-bootc/el9/layer1-base/group2/rhel98-bootc-crel.containerfile
  • test/image-blueprints-bootc/el9/layer1-base/group2/rhel98-bootc.image-bootc
  • test/image-blueprints-bootc/el9/layer4-release/group1/rhel96-bootc-brew-y1-with-optional.containerfile
  • test/image-blueprints-bootc/el9/layer4-release/group1/rhel96-bootc-brew-y2-with-optional.containerfile
  • test/image-blueprints-bootc/el9/layer4-release/group1/rhel98-bootc-brew-lrel-optional.containerfile
  • test/image-blueprints-bootc/el9/layer4-release/group1/rhel98-bootc-brew-nightly-with-optional.containerfile
  • test/image-blueprints-bootc/el9/layer4-release/group2/rhel98-bootc-brew-lrel-fips.containerfile
  • test/image-blueprints-bootc/el9/layer4-release/group2/rhel98-bootc-brew-lrel-optional.image-bootc
  • test/image-blueprints-bootc/el9/layer4-release/group2/rhel98-bootc-brew-lrel-tuned.containerfile

Walkthrough

The changes extend bootc image build infrastructure to support combined el9 and el10 layer sets in CI builds. The CI build script now uses per-OS layer1-base blueprints and conditionally adds release-specific builds, while switching non-CI builds to single invocations with comma-separated layer values. The Python utility adds explicit support for processing multiple layer directories in a single invocation with per-directory validation.

Changes

Cohort / File(s) Summary
CI build script
test/bin/ci_phase_iso_build.sh
Modified run_bootc_image_build to use per-OS blueprints for layer1-base selection instead of a single fixed path, added conditional el9 layer for el10 upgrade tests, and changed non-CI full-build mode to use single calls with comma-separated layer directories instead of per-OS loop invocations. Added release-specific layer4-release builds for matching CI job names.
Python build utility
test/bin/pyutils/build_bootc_images.py
Extended --layer-dir argument to accept comma-separated directory list with updated help text. Modified main() to split, validate, and convert each directory to absolute paths, then iterate over all directories processing subdirectories per layer with explicit existence checks.

Estimated code review effort

🎯 3 (Moderate) | ⏱️ ~25 minutes

🚥 Pre-merge checks | ✅ 10
✅ Passed checks (10 passed)
Check name Status Explanation
Description Check ✅ Passed Check skipped - CodeRabbit’s high-level summary is enabled.
Title check ✅ Passed The title clearly describes the main change: enabling parallel building of multiple bootc blueprint layers, which aligns with the file modifications that add multi-layer support and parallel build logic.
Docstring Coverage ✅ Passed No functions found in the changed files to evaluate docstring coverage. Skipping docstring coverage check.
Stable And Deterministic Test Names ✅ Passed PR modifies only bash and Python scripts without Ginkgo tests, so custom check is not applicable.
Test Structure And Quality ✅ Passed This check is not applicable to the PR. The changeset modifies only shell scripts and Python utilities for CI build orchestration—no Ginkgo test files are present.
Microshift Test Compatibility ✅ Passed PR modifies shell scripts and Python utilities for bootc image building, not Ginkgo e2e tests.
Single Node Openshift (Sno) Test Compatibility ✅ Passed PR modifies only build infrastructure scripts without adding Ginkgo e2e tests or SNO-incompatible patterns.
Topology-Aware Scheduling Compatibility ✅ Passed Modified CI build scripts lack Kubernetes scheduling constraints affecting OpenShift cluster topologies.
Ote Binary Stdout Contract ✅ Passed OTE Binary Stdout Contract applies only to Go test binaries. Changes modify shell and Python CI build scripts, which are infrastructure utilities not subject to JSON stdout requirements.
Ipv6 And Disconnected Network Test Compatibility ✅ Passed PR modifies only CI/build infrastructure scripts (shell and Python), not Ginkgo e2e tests. Custom check targets new Ginkgo e2e tests and is not applicable.

✏️ Tip: You can configure your own custom pre-merge checks in the settings.

✨ Finishing Touches
🧪 Generate unit tests (beta)
  • Create PR with unit tests

Comment @coderabbitai help to get the list of available commands and usage tips.

@openshift-ci
Copy link
Copy Markdown
Contributor

openshift-ci bot commented Apr 10, 2026

[APPROVALNOTIFIER] This PR is NOT APPROVED

This pull-request has been approved by: vanhalenar
Once this PR has been reviewed and has the lgtm label, please assign jogeo for approval. For more information see the Code Review Process.

The full list of commands accepted by this bot can be found here.

Details Needs approval from an approver in each of these files:

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

@vanhalenar vanhalenar force-pushed the build_bootc_upgrades branch from fca82e1 to 4bc7f1c Compare April 13, 2026 08:23
@vanhalenar vanhalenar marked this pull request as ready for review April 13, 2026 14:53
@openshift-ci openshift-ci bot removed the do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. label Apr 13, 2026
@openshift-ci openshift-ci bot requested review from jerpeter1 and pacevedom April 13, 2026 14:54
@openshift-ci-robot
Copy link
Copy Markdown

openshift-ci-robot commented Apr 13, 2026

@vanhalenar: This pull request references USHIFT-6715 which is a valid jira issue.

Warning: The referenced jira issue has an invalid target version for the target branch this PR targets: expected the task to target the "4.22.0" version, but no target version was set.

Details

In response to this:

Summary by CodeRabbit

  • New Features

  • Build system now supports processing multiple layer directories in a single invocation via comma-separated paths.

  • Added per-OS layer selection for combined OS builds.

  • Introduced release-specific layer build handling in CI.

  • Chores

  • Enhanced layer directory validation with explicit existence checks.

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the openshift-eng/jira-lifecycle-plugin repository.

@openshift-ci
Copy link
Copy Markdown
Contributor

openshift-ci bot commented Apr 13, 2026

@vanhalenar: The following tests failed, say /retest to rerun all failed tests or /retest-required to rerun all mandatory failed tests:

Test name Commit Details Required Rerun command
ci/prow/e2e-aws-tests-bootc-periodic-el10 194e259 link true /test e2e-aws-tests-bootc-periodic-el10
ci/prow/e2e-aws-tests 194e259 link true /test e2e-aws-tests
ci/prow/e2e-aws-tests-bootc-el10 194e259 link true /test e2e-aws-tests-bootc-el10

Full PR test history. Your PR dashboard.

Details

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes-sigs/prow repository. I understand the commands that are listed here.

help="Only build images of the specified type.")
dirgroup = parser.add_mutually_exclusive_group(required=False)
dirgroup.add_argument("-l", "--layer-dir", type=str, help="Path to the layer directory to process.")
dirgroup.add_argument("-l", "--layer-dir", type=str, help="Path to the layer directory to process. Accepts comma-separated list of directories.")
Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

How about using action="append"?

From the docs:

>>> parser = argparse.ArgumentParser()
>>> parser.add_argument('--foo', action='append', default=['0'])
>>> parser.parse_args('--foo 1 --foo 2'.split())
Namespace(foo=['0', '1', '2'])
Suggested change
dirgroup.add_argument("-l", "--layer-dir", type=str, help="Path to the layer directory to process. Accepts comma-separated list of directories.")
dirgroup.add_argument("-l", "--layer-dir", action="append", default=[], help="Path to the layer directory to process. Can be specified multiple times.")

and then:

$ ./bin/build_bootc_images.sh -l ./image-blueprints-bootc/el9/layer1-base -l ./image-blueprints-bootc/el10/layer1-base

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

jira/valid-reference Indicates that this PR references a valid Jira ticket of any type.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants