Always disable use of libvirt wheel with UCA

It's not only using our upstream caches that you might get an old
libvirt-python wheel that is incompatible with UCA.  Move the ignore
out of the mirror check to apply it globally.

This is an alternative to Iba301a8c80c9ed584f5fb5a816f3d2cf5f5f0e77

Change-Id: I588b1e8e49aa60f3ce976dc1b6c8013ba1d88079
This commit is contained in:
Ian Wienand 2017-04-21 11:48:12 +10:00 committed by Sam Wan
parent d8863f6c98
commit 71d20e6582

View File

@ -82,15 +82,17 @@ if [[ "$DISTRO" = "xenial" ]]; then
source /etc/ci/mirror_info.sh
sudo apt-add-repository -y "deb $NODEPOOL_UCA_MIRROR xenial-updates/ocata main"
# Disable use of libvirt wheel here as presence of mirror implies
# presence of cached wheel build against older libvirt binary.
# TODO(clarkb) figure out how to use wheel again.
sudo bash -c 'echo "no-binary = libvirt-python" >> /etc/pip.conf'
else
# Otherwise use upstream UCA
sudo add-apt-repository -y cloud-archive:ocata
fi
# Disable use of libvirt wheel since a cached wheel build might be
# against older libvirt binary. Particularly a problem if using
# the openstack wheel mirrors, but can hit locally too.
# TODO(clarkb) figure out how to use upstream wheel again.
iniset -sudo /etc/pip.conf "global" "no-binary" "libvirt-python"
# Force update our APT repos, since we added UCA above.
REPOS_UPDATED=False
apt_get_update