Merge "Update to using pike cloud-archive"

This commit is contained in:
Zuul 2017-10-02 09:41:47 +00:00 committed by Gerrit Code Review
commit b3b6c102d9

View File

@ -84,10 +84,10 @@ if [[ "${ENABLE_UBUNTU_CLOUD_ARCHIVE}" == "True" && "$DISTRO" = "xenial" ]]; the
# we can find local mirrors then use that mirror. # we can find local mirrors then use that mirror.
source /etc/ci/mirror_info.sh source /etc/ci/mirror_info.sh
sudo apt-add-repository -y "deb $NODEPOOL_UCA_MIRROR xenial-updates/ocata main" sudo apt-add-repository -y "deb $NODEPOOL_UCA_MIRROR xenial-updates/pike main"
else else
# Otherwise use upstream UCA # Otherwise use upstream UCA
sudo add-apt-repository -y cloud-archive:ocata sudo add-apt-repository -y cloud-archive:pike
fi fi
# Disable use of libvirt wheel since a cached wheel build might be # Disable use of libvirt wheel since a cached wheel build might be