openstack/devstack
Code Issues Proposed changes

Merge "Always disable use of libvirt wheel with UCA"

Browse Source
This commit is contained in:
Jenkins 2017-05-09 16:34:33 +00:00 committed by Gerrit Code Review
commit 6fe14a5d93
1 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
tools/fixup_stuff.sh
View File

@ -82,15 +82,17 @@ if [[ "$DISTRO" = "xenial" ]]; then
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/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 else
# Otherwise use upstream UCA # Otherwise use upstream UCA
sudo add-apt-repository -y cloud-archive:ocata sudo add-apt-repository -y cloud-archive:ocata
fi 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. # Force update our APT repos, since we added UCA above.
REPOS_UPDATED=False REPOS_UPDATED=False
apt_get_update apt_get_update