Skip to content

AGENT-1577: Use master branch of appliance as image builder #333

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
zaneb wants to merge 1 commit into
base: main
Choose a base branch
from
+3 −3
Draft

AGENT-1577: Use master branch of appliance as image builder #333

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion tools/iso_builder/CLAUDE.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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_<major.minor>_agent-preinstall-image-builder`
- Uses appliance image: `quay-proxy.ci.openshift.org/openshift/ci:ocp_<major.minor>_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`
Expand Down
2 changes: 1 addition & 1 deletion tools/iso_builder/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand Down
2 changes: 1 addition & 1 deletion tools/iso_builder/hack/build-ove-image.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down