Skip to content

e2e-metal: Switch to live-initramfs and live-kernel if set in rhcos.json #10121

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

Merged
openshift-merge-robot merged 1 commit into from
Aug 11, 2020
Merged

e2e-metal: Switch to live-initramfs and live-kernel if set in rhcos.json #10121

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
7 changes: 4 additions & 3 deletions ci-operator/templates/openshift/installer/cluster-launch-installer-metal-e2e.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -461,12 +461,13 @@ objects:
cp -r /var/lib/openshift-install/upi/metal/* /tmp/artifacts/terraform/
cp /bin/terraform-provider-matchbox /tmp/artifacts/terraform/

PXE_INITRD_URL="$(jq -r '.baseURI + .images["initramfs"].path' /var/lib/openshift-install/rhcos.json)"
Copy link
Contributor

@jstuever jstuever Jul 10, 2020

Choose a reason for hiding this comment

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

I believe rhcos.json is to be deprecated. Should use arch specific file such as rhcos-amd64.json

Copy link
Member

@cgwalters cgwalters Aug 6, 2020

Choose a reason for hiding this comment

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

Ultimately it will be replaced with openshift/enhancements#201

Using rhcos-amd64.json makes sense to me, though it seems orthogonal to this PR and could be done as a followup.

PXE_KERNEL_URL="$(jq -r '.baseURI + .images["kernel"].path' /var/lib/openshift-install/rhcos.json)"
PXE_INITRD_URL="$(jq -r '.baseURI + (.images["live-initramfs"].path // .images["initramfs"].path)' /var/lib/openshift-install/rhcos.json)"
PXE_KERNEL_URL="$(jq -r '.baseURI + (.images["live-kernel"].path // .images["kernel"].path)' /var/lib/openshift-install/rhcos.json)"
# 4.3 unified 'metal-bios' and 'metal-uefi' into just 'metal'
PXE_OS_IMAGE_URL="$(jq -r '.baseURI + (.images["metal-bios"].path // .images["metal"].path)' /var/lib/openshift-install/rhcos.json)"
PXE_ROOTFS_URL="$(jq -r '.baseURI + (.images["live-rootfs"].path)' /var/lib/openshift-install/rhcos.json)"
if [[ $PXE_KERNEL_URL =~ "live" ]]; then
PXE_KERNEL_ARGS=""
PXE_KERNEL_ARGS="coreos.live.rootfs_url=${PXE_ROOTFS_URL}"
else
PXE_KERNEL_ARGS="coreos.inst.image_url=${PXE_OS_IMAGE_URL}"
fi
Expand Down