Skip to content

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

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

USHIFT-6715: Enable building multiple bootc blueprint layers in parallel#6489
vanhalenar wants to merge 9 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

    • Per-OS layer selection for combined el9/el10 image builds.
    • Release-specific layer build handling in CI pipelines.
    • Support processing multiple layer directories in a single invocation for combined OS builds.
  • Chores

    • Improved validation of provided layer directories 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: ba71d0bd-5967-4476-8603-329929d1ece7

📥 Commits

Reviewing files that changed from the base of the PR and between 81e1434 and 9b00c4d.

📒 Files selected for processing (1)
  • test/bin/ci_phase_iso_build.sh
✅ Files skipped from review due to trivial changes (1)
  • test/bin/ci_phase_iso_build.sh

Walkthrough

Switches bootc layer builds to per-OS el9/el10 blueprints in the CI shell script and updates the Python build utility to accept and validate multiple -l/--layer-dir occurrences, allowing one invocation to process multiple layer directories and their subdirectories.

Changes

Cohort / File(s) Summary
CI build script
test/bin/ci_phase_iso_build.sh
Switches bootc blueprint selection to per-OS paths (.../el9/... and .../el10/...), uses ${os}/layer1-base for CI el9/el10 jobs, explicitly adds el9/layer1-base for el10 upgrade jobs, emits layer4-release only for release CI jobs, and replaces previous non‑CI per-OS loop with combined build invocations that pass both el9 and el10 layer paths via repeated -l arguments.
Python build utility
test/bin/pyutils/build_bootc_images.py
Changes -l/--layer-dir to allow multiple occurrences (action="append", default=[]), converts each provided path to an absolute path, validates existence (raises if missing), and iterates over each layer directory processing its subdirectories so a single run can handle multiple layer-dir inputs.

Sequence Diagram(s)

sequenceDiagram
  autonumber
  participant CI as CI job
  participant Shell as `ci_phase_iso_build.sh`
  participant Py as `build_bootc_images.py`
  participant FS as Blueprints filesystem
  CI->>Shell: start job (CI_JOB_NAME, os=el9/el10)
  Shell->>FS: select per-OS blueprint paths (`.../el9/...`, `.../el10/...`)
  Shell->>Py: invoke build_bootc_images.py with repeated `-l` args
  Py->>FS: validate each provided layer-dir exists
  Py->>FS: enumerate and process each layer subdirectory
  Py-->>Shell: return build results
  Shell-->>CI: report job outcome
Loading

Estimated code review effort

🎯 2 (Simple) | ⏱️ ~10 minutes

🚥 Pre-merge checks | ✅ 9 | ❌ 1

❌ Failed checks (1 warning)

Check name Status Explanation Resolution
Docstring Coverage ⚠️ Warning Docstring coverage is 0.00% which is insufficient. The required threshold is 80.00%. Write docstrings for the functions missing them to satisfy the coverage threshold.
✅ Passed checks (9 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 objective: enabling parallel building of multiple bootc blueprint layers, which aligns with the changeset modifications to support multiple layer directories and per-OS blueprint selection.
Stable And Deterministic Test Names ✅ Passed PR modifies only shell and Python scripts without Ginkgo test constructs, so the Ginkgo test naming check is not applicable.
Test Structure And Quality ✅ Passed PR modifies shell and Python scripts, not Ginkgo test files. Custom check for Ginkgo tests does not apply.
Microshift Test Compatibility ✅ Passed PR contains no new Ginkgo e2e tests; changes are only to build automation scripts.
Single Node Openshift (Sno) Test Compatibility ✅ Passed PR modifies only build scripts and Python utilities, not Ginkgo e2e tests. Check does not apply.
Topology-Aware Scheduling Compatibility ✅ Passed The custom check for topology-aware scheduling compatibility applies only to changes in deployment manifests, operator code, or controllers. This PR modifies only build-time CI scripts and tooling for constructing bootc images. No Kubernetes deployment manifests, operator code, or scheduling constraints are introduced.
Ote Binary Stdout Contract ✅ Passed The custom check for 'OTE Binary Stdout Contract' does not apply to these changes. Modified files are build infrastructure scripts, not OTE binaries.
Ipv6 And Disconnected Network Test Compatibility ✅ Passed PR does not add new Ginkgo e2e tests; only modifies shell and Python CI scripts.

✏️ 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.

Comment thread test/bin/pyutils/build_bootc_images.py Outdated
@openshift-ci-robot
Copy link
Copy Markdown

openshift-ci-robot commented Apr 15, 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 "5.0.0" version, but no target version was set.

Details

In response to this:

Summary by CodeRabbit

  • New Features

  • Support processing multiple layer directories in a single invocation for combined OS builds.

  • Per-OS layer selection for combined el9/el10 image builds.

  • Release-specific layer build handling in CI pipelines.

  • Chores

  • Improved validation of provided layer directories 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-robot
Copy link
Copy Markdown

openshift-ci-robot commented Apr 15, 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 "5.0.0" version, but no target version was set.

Details

In response to this:

Summary by CodeRabbit

  • New Features

  • Per-OS layer selection for combined el9/el10 image builds.

  • Release-specific layer build handling in CI pipelines.

  • Support processing multiple layer directories in a single invocation for combined OS builds.

  • Chores

  • Improved validation of provided layer directories 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.

@vanhalenar
Copy link
Copy Markdown
Contributor Author

/test e2e-aws-tests e2e-aws-tests-bootc-periodic-el10 e2e-aws-tests-periodic

@openshift-ci
Copy link
Copy Markdown
Contributor

openshift-ci bot commented Apr 15, 2026

@vanhalenar: all tests passed!

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.

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