From e17ddff2c298b0b0b712ab564d78ee83b11b8c4a Mon Sep 17 00:00:00 2001 From: Zane Bitter Date: Thu, 6 Aug 2026 22:40:13 +1200 Subject: [PATCH] AGENT-1577: Use master branch of appliance as image builder Switch to the agent-release-iso-builder CI image that is built from the current OCP release branch. This replaces agent-preinstall-image-builder, which is now built from the branch of the same name and does not use stable branches. --- tools/iso_builder/CLAUDE.md | 2 +- tools/iso_builder/Dockerfile | 2 +- tools/iso_builder/hack/build-ove-image.sh | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/tools/iso_builder/CLAUDE.md b/tools/iso_builder/CLAUDE.md index fbfa75c..720016b 100644 --- a/tools/iso_builder/CLAUDE.md +++ b/tools/iso_builder/CLAUDE.md @@ -94,7 +94,7 @@ The build follows these steps: - SSH key (optional) 4. **ISO Build** (`build_live_iso()`) - - Uses appliance image: `quay-proxy.ci.openshift.org/openshift/ci:ocp__agent-preinstall-image-builder` + - Uses appliance image: `quay-proxy.ci.openshift.org/openshift/ci:ocp__agent-release-iso-builder` - Runs podman with privileged mode and host networking - Mounts appliance work dir to `/assets` in container - Executes: `build live-iso --log-level debug` diff --git a/tools/iso_builder/Dockerfile b/tools/iso_builder/Dockerfile index 6def2cd..647ccce 100644 --- a/tools/iso_builder/Dockerfile +++ b/tools/iso_builder/Dockerfile @@ -1,5 +1,5 @@ ARG MAJOR_MINOR_VERSION -FROM quay-proxy.ci.openshift.org/openshift/ci:ocp_${MAJOR_MINOR_VERSION}_agent-preinstall-image-builder AS builder +FROM quay-proxy.ci.openshift.org/openshift/ci:ocp_${MAJOR_MINOR_VERSION}_agent-release-iso-builder AS builder # Define the arguments that will be passed in from the pipeline ARG RELEASE_FLAG diff --git a/tools/iso_builder/hack/build-ove-image.sh b/tools/iso_builder/hack/build-ove-image.sh index 8547093..302ec8c 100755 --- a/tools/iso_builder/hack/build-ove-image.sh +++ b/tools/iso_builder/hack/build-ove-image.sh @@ -70,7 +70,7 @@ EOF function build_live_iso() { if [ ! -f "${appliance_work_dir}"/appliance.iso ]; then - local appliance_image="${APPLIANCE_IMAGE:-quay-proxy.ci.openshift.org/openshift/ci:ocp_${major_minor_version}_agent-preinstall-image-builder}" + local appliance_image="${APPLIANCE_IMAGE:-quay-proxy.ci.openshift.org/openshift/ci:ocp_${major_minor_version}_agent-release-iso-builder}" echo "Building appliance ISO (image: ${appliance_image})" # Build the podman run command as an array to avoid shell injection