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