Skip to content

templates/installer/e2e-metal: use the rhcos.json from upi-installer image and fix bootstrap_ip retrieval #3612

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 2 commits into from
Apr 29, 2019
Merged

templates/installer/e2e-metal: use the rhcos.json from upi-installer image and fix bootstrap_ip retrieval #3612

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
99cd74a
templates/installer/e2e-metal: fix bootstrap_ip retrieval
abhinavdahiya Apr 26, 2019
c85599a
templates/installer/e2e-metal: use the rhcos.json from upi-installer …
abhinavdahiya Apr 26, 2019
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
13 changes: 7 additions & 6 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 @@ -191,8 +191,6 @@ objects:
value: /etc/openshift-installer/matchbox-client.crt
- name: MATCHBOX_CLIENT_KEY
value: /etc/openshift-installer/matchbox-client.key
- name: RHCOS_BUILD_ID
value: "410.8.20190401.0"
- name: CLUSTER_NAME
value: ${NAMESPACE}-${JOB_NAME_HASH}
- name: BASE_DOMAIN
Expand Down Expand Up @@ -261,6 +259,9 @@ 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)"
PXE_KERNEL_URL="$(jq -r '.baseURI + .images["kernel"].path' /var/lib/openshift-install/rhcos.json)"
PXE_OS_IMAGE_URL="$(jq -r '.baseURI + .images["metal-bios"].path' /var/lib/openshift-install/rhcos.json)"
cat > /tmp/artifacts/terraform/terraform.tfvars <<-EOF
cluster_id = "${CLUSTER_NAME}"
bootstrap_ign_file = "/tmp/artifacts/installer/bootstrap.ign"
Expand All @@ -274,9 +275,9 @@ objects:
matchbox_trusted_ca_cert = "/var/run/secrets/kubernetes.io/serviceaccount/service-ca.crt"
packet_project_id = "${PACKET_PROJECT_ID}"
public_r53_zone = "${BASE_DOMAIN}"
pxe_initrd_url = "https://releases-rhcos.svc.ci.openshift.org/storage/releases/ootpa/${RHCOS_BUILD_ID}/rhcos-${RHCOS_BUILD_ID}-installer-initramfs.img"
pxe_kernel_url = "https://releases-rhcos.svc.ci.openshift.org/storage/releases/ootpa/${RHCOS_BUILD_ID}/rhcos-${RHCOS_BUILD_ID}-installer-kernel"
pxe_os_image_url = "https://releases-rhcos.svc.ci.openshift.org/storage/releases/ootpa/${RHCOS_BUILD_ID}/rhcos-${RHCOS_BUILD_ID}-metal-bios.raw"
pxe_initrd_url = "${PXE_INITRD_URL}"
pxe_kernel_url = "${PXE_KERNEL_URL}"
pxe_os_image_url = "${PXE_OS_IMAGE_URL}"
worker_count = "3"
worker_ign_file = "/tmp/artifacts/installer/worker.ign"
EOF
Expand Down Expand Up @@ -375,7 +376,7 @@ objects:

if [ -f /tmp/artifacts/terraform/terraform.tfstate ]
then
bootstrap_ip=$(terraform output -json | jq -r '.bootstrap_ip.value')
bootstrap_ip=$(terraform output -state /tmp/artifacts/terraform/terraform.tfstate -json | jq -r '.bootstrap_ip.value')

if [ -n "${bootstrap_ip}" ]
then
Expand Down