Skip to content

USHIFT-6712: Skip release block in run_bootc_image_build() microshift CI jobs#6382

Open
agullon wants to merge 1 commit intoopenshift:mainfrom
agullon:fix/restore-release-skip-bootc-build
Open

USHIFT-6712: Skip release block in run_bootc_image_build() microshift CI jobs#6382
agullon wants to merge 1 commit intoopenshift:mainfrom
agullon:fix/restore-release-skip-bootc-build

Conversation

@agullon
Copy link
Contributor

@agullon agullon commented Mar 20, 2026

Summary

  • Restores the release-skip block in run_bootc_image_build() that was accidentally removed by PR USHIFT-6547: Add RHEL 10 CI lane #6330 (USHIFT-6547: Add RHEL 10 CI lane).
  • Release CI jobs fetch all images from S3 cache and should skip all builds, only running build_bootc_images.sh -X to extract container images.
  • The regex is extended with (-el(9|10)? to match the new OS-suffixed bootc job names (e.g. *-release-el9, *-release-el10).

Ref: #6330 (comment)
Original implementation: #6149

@coderabbitai
Copy link

coderabbitai bot commented Mar 20, 2026

No actionable comments were generated in the recent review. 🎉

ℹ️ Recent review info
⚙️ Run configuration

Configuration used: Repository YAML (base), Organization UI (inherited)

Review profile: CHILL

Plan: Pro

Run ID: d897b54d-36e7-43e8-9882-ef4dfe77cb56

📥 Commits

Reviewing files that changed from the base of the PR and between 6bb36b6 and 7b0726d.

📒 Files selected for processing (1)
  • test/bin/ci_phase_iso_build.sh
🚧 Files skipped from review as they are similar to previous changes (1)
  • test/bin/ci_phase_iso_build.sh

Walkthrough

The CI script test/bin/ci_phase_iso_build.sh now detects release-testing CI_JOB_NAME patterns (optionally -arm, optional -el9/-el10) and, for those jobs, runs ./bin/build_bootc_images.sh -X then returns immediately, skipping the subsequent OS-specific bootc image layer build logic.

Changes

Cohort / File(s) Summary
CI Boot Image Build Script
test/bin/ci_phase_iso_build.sh
Added an early CI_JOB_NAME guard for release-testing patterns that invokes ./bin/build_bootc_images.sh -X (dry run) and returns, bypassing existing OS-token parsing and conditional layer build branches.

Estimated code review effort

🎯 2 (Simple) | ⏱️ ~10 minutes

✨ Finishing Touches
🧪 Generate unit tests (beta)
  • Create PR with unit tests
📝 Coding Plan
  • Generate coding plan for human review comments

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

Tip

CodeRabbit can scan for known vulnerabilities in your dependencies using OSV Scanner.

OSV Scanner will automatically detect and report security vulnerabilities in your project's dependencies. No additional configuration is required.

@openshift-ci openshift-ci bot requested review from jogeo and pmtk March 20, 2026 08:22
@openshift-ci
Copy link
Contributor

openshift-ci bot commented Mar 20, 2026

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: agullon

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

The pull request process is described 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

@openshift-ci openshift-ci bot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Mar 20, 2026
@agullon agullon changed the title fix: restore release-skip block in run_bootc_image_build() USHIFT-6712: Skip release block in run_bootc_image_build() microshift CI jobs Mar 20, 2026
@openshift-ci-robot openshift-ci-robot added the jira/valid-reference Indicates that this PR references a valid Jira ticket of any type. label Mar 20, 2026
@openshift-ci-robot
Copy link

openshift-ci-robot commented Mar 20, 2026

@agullon: This pull request references USHIFT-6712 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 feature to target the "4.22.0" version, but no target version was set.

Details

In response to this:

Summary

  • Restores the release-skip block in run_bootc_image_build() that was accidentally removed by PR USHIFT-6547: Add RHEL 10 CI lane #6330 (USHIFT-6547: Add RHEL 10 CI lane).
  • Release CI jobs fetch all images from S3 cache and should skip all builds, only running build_bootc_images.sh -X to extract container images.
  • The regex is extended with (-el[0-9]+)? to match the new OS-suffixed bootc job names (e.g. *-release-el9, *-release-el10).

Ref: #6330 (comment)
Original implementation: #6149

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.

@agullon
Copy link
Contributor Author

agullon commented Mar 20, 2026

/test e2e-aws-tests-release
/test e2e-aws-tests-release-arm
/test e2e-aws-tests-bootc-release-el9
/test e2e-aws-tests-bootc-release-el10
/test e2e-aws-tests-bootc-release-arm-el9
/test e2e-aws-tests-bootc-release-arm-el10

if [[ "${CI_JOB_NAME}" =~ .*release(-arm)?(-el[0-9]+)?$ ]]; then
$(dry_run) bash -x ./bin/build_bootc_images.sh -X
return
fi
Copy link
Contributor

@ggiguash ggiguash Mar 20, 2026

Choose a reason for hiding this comment

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

Should we remove this block?

Copy link
Contributor

Choose a reason for hiding this comment

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

Also, why do we need such a complex regex?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

what block to you mean? the link redirects me to this comment

Copy link
Contributor Author

Choose a reason for hiding this comment

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

About the regexp, I modify it a little bit to improve readability but I think it's good as it is, see this for better understanding: https://regex101.com/r/VivrQ3/2

Copy link
Contributor

Choose a reason for hiding this comment

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

The regexp is good, but it's more complex than required. All other places we use a simpler .*release.* expression, which should be good here as well, right?

Copy link
Contributor

Choose a reason for hiding this comment

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

For the lines of code, I mean lines 141-143 (before the change) or 146-148 after.

@agullon agullon force-pushed the fix/restore-release-skip-bootc-build branch from 9698a51 to 6bb36b6 Compare March 20, 2026 14:27
@agullon agullon force-pushed the fix/restore-release-skip-bootc-build branch from 6bb36b6 to 7b0726d Compare March 20, 2026 14:30
@openshift-ci-robot
Copy link

openshift-ci-robot commented Mar 20, 2026

@agullon: This pull request references USHIFT-6712 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 feature to target the "4.22.0" version, but no target version was set.

Details

In response to this:

Summary

  • Restores the release-skip block in run_bootc_image_build() that was accidentally removed by PR USHIFT-6547: Add RHEL 10 CI lane #6330 (USHIFT-6547: Add RHEL 10 CI lane).
  • Release CI jobs fetch all images from S3 cache and should skip all builds, only running build_bootc_images.sh -X to extract container images.
  • The regex is extended with (-el(9|10)? to match the new OS-suffixed bootc job names (e.g. *-release-el9, *-release-el10).

Ref: #6330 (comment)
Original implementation: #6149

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.

@agullon
Copy link
Contributor Author

agullon commented Mar 20, 2026

/test e2e-aws-tests-release
/test e2e-aws-tests-release-arm
/test e2e-aws-tests-bootc-release-el9
/test e2e-aws-tests-bootc-release-el10
/test e2e-aws-tests-bootc-release-arm-el9
/test e2e-aws-tests-bootc-release-arm-el10

@openshift-ci
Copy link
Contributor

openshift-ci bot commented Mar 20, 2026

@agullon: 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-el9 7b0726d link true /test e2e-aws-tests-bootc-periodic-el9
ci/prow/e2e-aws-tests-bootc-release-arm-el10 7b0726d link true /test e2e-aws-tests-bootc-release-arm-el10
ci/prow/e2e-aws-tests-bootc-release-el9 7b0726d link true /test e2e-aws-tests-bootc-release-el9
ci/prow/e2e-aws-tests-bootc-release-el10 7b0726d link true /test e2e-aws-tests-bootc-release-el10
ci/prow/e2e-aws-tests-bootc-release-arm-el9 7b0726d link true /test e2e-aws-tests-bootc-release-arm-el9
ci/prow/e2e-aws-tests-release-arm 7b0726d link true /test e2e-aws-tests-release-arm
ci/prow/e2e-aws-tests-release 7b0726d link true /test e2e-aws-tests-release

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

approved Indicates a PR has been approved by an approver from all required OWNERS files. 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