From 1052eefd6c209378485b9f1a10cb75c90366e9f0 Mon Sep 17 00:00:00 2001 From: Ian Wienand Date: Wed, 3 Nov 2021 08:29:13 +1100 Subject: [PATCH] Don't use OpenDev infra mirror for F29 images OpenDev infra is going to remove these images from the mirrors. Directly reference the upstream images. Cherry-Picked-From: cea527a6435b2dff5ee5a06815da242914103f96 Change-Id: Ie3c8dff0bad6db483b54086afed0402ef24b0b4b --- magnum/tests/contrib/gate_hook.sh | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/magnum/tests/contrib/gate_hook.sh b/magnum/tests/contrib/gate_hook.sh index d7347e10c6..e52d715620 100755 --- a/magnum/tests/contrib/gate_hook.sh +++ b/magnum/tests/contrib/gate_hook.sh @@ -41,8 +41,6 @@ if [[ -e /etc/ci/mirror_info.sh ]]; then source /etc/ci/mirror_info.sh fi -NODEPOOL_ATOMIC_MIRROR=${NODEPOOL_FEDORA_MIRROR:-https://download.fedoraproject.org/pub/alt} - if [ "$coe" = "mesos" ]; then export DEVSTACK_LOCAL_CONFIG+=$'\n'"MAGNUM_GUEST_IMAGE_URL=https://fedorapeople.org/groups/magnum/ubuntu-mesos-ocata.qcow2" elif [ "$coe" = "k8s-coreos" ]; then @@ -88,7 +86,7 @@ elif [ "${coe}${special}" = "k8s-ironic" ]; then export DEVSTACK_LOCAL_CONFIG+=$'\n'"IRONIC_VM_SPECS_DISK=10" export DEVSTACK_LOCAL_CONFIG+=$'\n'"IRONIC_VM_EPHEMERAL_DISK=5" else - export DEVSTACK_LOCAL_CONFIG+=$'\n'"MAGNUM_GUEST_IMAGE_URL='${NODEPOOL_ATOMIC_MIRROR}/atomic/stable/Fedora-29-updates-20190820.0/AtomicHost/x86_64/images/Fedora-AtomicHost-29-20190820.0.x86_64.qcow2'" + export DEVSTACK_LOCAL_CONFIG+=$'\n'"MAGNUM_GUEST_IMAGE_URL='https://dl.fedoraproject.org/pub/alt/atomic/stable/Fedora-29-updates-20190820.0/AtomicHost/x86_64/images/Fedora-AtomicHost-29-20190820.0.x86_64.qcow2'" export DEVSTACK_LOCAL_CONFIG+=$'\n'"MAGNUM_IMAGE_NAME='Fedora-AtomicHost-29-20190820.0.x86_64'" fi