From b495c16369644e7c722e18c264cb23b227685d6e Mon Sep 17 00:00:00 2001 From: adobes1 Date: Wed, 3 Jun 2026 15:33:05 +0200 Subject: [PATCH] Build ose-machine-os-images hermetically Switch to rpm-lockfile-prototype backend for automatic transitive RPM dependency resolution. Add RHCOS ISO URLs as Cachi2 generic artifacts so they are prefetched instead of downloaded at build time. Remove network_mode: open. ISO URLs sourced from the installer image's embedded stream JSON (build 414.92.202407091253-0). Temporary url_pull added for testing. rh-pre-commit.version: 2.3.2 rh-pre-commit.check-secrets: ENABLED --- images/ose-machine-os-images.yml | 17 ++++++++++++++++- 1 file changed, 16 insertions(+), 1 deletion(-) diff --git a/images/ose-machine-os-images.yml b/images/ose-machine-os-images.yml index 3121b2ee88..28923c0067 100644 --- a/images/ose-machine-os-images.yml +++ b/images/ose-machine-os-images.yml @@ -8,6 +8,7 @@ content: branch: target: release-{MAJOR}.{MINOR} url: git@github.com:openshift-priv/machine-os-images.git + url_pull: git@github.com:adobes1/machine-os-images.git web: https://github.com/openshift/machine-os-images enabled_repos: - rhel-8-baseos-rpms @@ -26,7 +27,21 @@ konflux: # ref thread: https://redhat-internal.slack.com/archives/C04PZ7H0VA8/p1743022042311039 # can be removed after whilelist is in x86_64: linux/amd64 - network_mode: open + cachi2: + lockfile: + backend: rpm-lockfile-prototype + artifact_lockfile: + # RHCOS ISO URLs sourced from openshift/installer repo: + # data/data/coreos/rhcos.json + # These are the same URLs that openshift-install coreos print-stream-json outputs. + # Whenever it changes, update these URLs to match .architectures.{arch}.artifacts.metal.formats.iso.disk.location + resources: + - url: https://rhcos.mirror.openshift.com/art/storage/prod/streams/4.14-9.2/builds/414.92.202407091253-0/x86_64/rhcos-414.92.202407091253-0-live.x86_64.iso + filename: coreos-x86_64.iso + - url: https://rhcos.mirror.openshift.com/art/storage/prod/streams/4.14-9.2/builds/414.92.202407091253-0/aarch64/rhcos-414.92.202407091253-0-live.aarch64.iso + filename: coreos-aarch64.iso + - url: https://rhcos.mirror.openshift.com/art/storage/prod/streams/4.14-9.2/builds/414.92.202407091253-0/ppc64le/rhcos-414.92.202407091253-0-live.ppc64le.iso + filename: coreos-ppc64le.iso delivery: delivery_repo_names: - openshift4/ose-machine-os-images-rhel8