From cdb423eeb917aee08a983df0aedebc8aaa250af2 Mon Sep 17 00:00:00 2001 From: Mark Hamzy Date: Thu, 1 Mar 2018 14:29:17 -0600 Subject: [PATCH] secondary architectures use different url The Fedora-Cloud-Base*qcow2 images are stored on a different server for secondary architectures. Change-Id: I90d48ce4175fd251e8f5ab7a70190ad952256a94 --- .../elements/fedora/root.d/10-fedora-cloud-image | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/diskimage_builder/elements/fedora/root.d/10-fedora-cloud-image b/diskimage_builder/elements/fedora/root.d/10-fedora-cloud-image index 7d1d9d21..4ec3372e 100755 --- a/diskimage_builder/elements/fedora/root.d/10-fedora-cloud-image +++ b/diskimage_builder/elements/fedora/root.d/10-fedora-cloud-image @@ -24,8 +24,18 @@ if [ -n "$DIB_LOCAL_IMAGE" ]; then BASE_IMAGE_TAR=$BASE_IMAGE_FILE.tgz else # note default DIB_RELEASE set in environment setup - # Not sure if ${ARCH} is defined for anything but x86_64 here - DIB_CLOUD_IMAGES=${DIB_CLOUD_IMAGES:-https://download.fedoraproject.org/pub/fedora/linux/releases/${DIB_RELEASE}/CloudImages/${ARCH}/images} + case ${ARCH} in + x86_64) + DIB_CLOUD_IMAGES=${DIB_CLOUD_IMAGES:-https://download.fedoraproject.org/pub/fedora/linux/releases/${DIB_RELEASE}/CloudImages/${ARCH}/images} + ;; + aarch64|ppc64|ppc64le) + DIB_CLOUD_IMAGES=${DIB_CLOUD_IMAGES:-https://dl.fedoraproject.org/pub/fedora-secondary/releases/${DIB_RELEASE}/CloudImages/${ARCH}/images} + ;; + *) + echo "Error: unknown ARCH: ${ARCH}" + exit 1 + ;; + esac BASE_IMAGE_FILE=${BASE_IMAGE_FILE:-Fedora-Cloud-Base-$DIB_RELEASE-$DIB_FEDORA_SUBRELEASE.$ARCH.qcow2} BASE_IMAGE_TAR=Fedora-Cloud-Base-$DIB_RELEASE-$DIB_FEDORA_SUBRELEASE.$ARCH.tgz IMAGE_LOCATION=$DIB_CLOUD_IMAGES/$BASE_IMAGE_FILE