Skip to content

[openshift-4.22] ART-17441: Build ose-machine-os-images hermetically#11114

Merged
openshift-merge-bot[bot] merged 1 commit into
openshift-eng:openshift-4.22from
adobes1:4.22-machine-os-images-hermetic
Jun 22, 2026
Merged

[openshift-4.22] ART-17441: Build ose-machine-os-images hermetically#11114
openshift-merge-bot[bot] merged 1 commit into
openshift-eng:openshift-4.22from
adobes1:4.22-machine-os-images-hermetic

Conversation

@adobes1

@adobes1 adobes1 commented Jun 9, 2026

Copy link
Copy Markdown
Contributor

Summary

ose-machine-os-images can't be built hermetically by default because fetch_image.sh downloads RHCOS ISO images at build time from an internal mirror.

This adds support for Cachi2 generic artifact prefetching. When the Cachi2 prefetch directory (/cachi2/output/deps/generic/) exists, fetch_image.sh copies ISOs from there instead of downloading them.

Changes

  • Switch RPM lockfile backend to rpm-lockfile-prototype
  • Add artifact_lockfile.resources with RHCOS ISO URLs matching the installer image
  • Remove network_mode: open

@adobes1

adobes1 commented Jun 9, 2026

Copy link
Copy Markdown
Contributor Author

/hold Requires openshift/machine-os-images#96 to be merged first

@openshift-ci openshift-ci Bot added the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Jun 9, 2026
@adobes1 adobes1 changed the title [openshift-4.22] Build ose-machine-os-images hermetically [openshift-4.22] ART-17441: Build ose-machine-os-images hermetically Jun 9, 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 Jun 9, 2026
@openshift-ci-robot

openshift-ci-robot commented Jun 9, 2026

Copy link
Copy Markdown

@adobes1: This pull request references ART-17441 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

ose-machine-os-images can't be built hermetically by default because fetch_image.sh downloads RHCOS ISO images at build time from an internal mirror.

This adds support for Cachi2 generic artifact prefetching. When the Cachi2 prefetch directory (/cachi2/output/deps/generic/) exists, fetch_image.sh copies ISOs from there instead of downloading them.

Changes

  • Switch RPM lockfile backend to rpm-lockfile-prototype
  • Add artifact_lockfile.resources with RHCOS ISO URLs matching the installer image
  • Remove network_mode: open

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.

Use Cachi2 artifact lockfile to prefetch RHCOS ISOs before the build,
removing the need for network_mode: open.

Installer build: ose-installer-container-v4.22.0-202606041345.p2.ge6b9ec0.assembly.stream.el9

Note: url_pull is temporary for testing and should be removed before merging.

rh-pre-commit.version: 2.3.2
rh-pre-commit.check-secrets: ENABLED
@adobes1 adobes1 force-pushed the 4.22-machine-os-images-hermetic branch from 5ed8027 to a431fb5 Compare June 19, 2026 13:23
@adobes1

adobes1 commented Jun 22, 2026

Copy link
Copy Markdown
Contributor Author

/unhold Test build

@openshift-ci openshift-ci Bot removed the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Jun 22, 2026
@adobes1

adobes1 commented Jun 22, 2026

Copy link
Copy Markdown
Contributor Author

/retest

@fgallott

Copy link
Copy Markdown
Contributor

/lgtm
/approve

@openshift-ci openshift-ci Bot added the lgtm Indicates that a PR is ready to be merged. label Jun 22, 2026
@openshift-ci

openshift-ci Bot commented Jun 22, 2026

Copy link
Copy Markdown
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: fgallott

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 Jun 22, 2026
@openshift-merge-bot openshift-merge-bot Bot merged commit b9f86e6 into openshift-eng:openshift-4.22 Jun 22, 2026
4 checks passed
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. lgtm Indicates that a PR is ready to be merged.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants