openstack
/
project-config
Code Issues Proposed changes

nodepool elements: fix pip upgrade venv 

Change I316e9587b6e290cd421b47f506c91dbebe0975c0 had a rather
embarrasing oversight in that it copied the /usr/bindep-env/bin/pip
invocation for upgrading pip to all the other venv's.

i.e. we were upgrading hte bindep-env pip over and over, and not
actually the pip in the working venv.  The os-testr install on older
platforms has now broken because it still tries to install with the
ancient inbuilt pip -- local testing has confirmed that it works with
the updated pip.

Change-Id: I22c549b5f9b9e3882fcd2340946d2850b0b2f86b
This commit is contained in:
Ian Wienand 2022-07-06 13:27:58 +10:00
parent e0143fb660
commit efbb9b8961
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
nodepool/elements/infra-package-needs/install.d/40-install-tox
View File

@ -26,8 +26,8 @@ python3 -m venv /usr/tox-env
if [[ ${DIB_RELEASE} == 'xenial' ]]; then
# The pip on xenial can't figure out it shouldn't install
# the latest pip; this is the last to support 3.5
/usr/bindep-env/bin/pip install --upgrade pip==20.3.4
/usr/tox-env/bin/pip install --upgrade pip==20.3.4
else
/usr/bindep-env/bin/pip install --upgrade pip
/usr/tox-env/bin/pip install --upgrade pip
fi
/usr/tox-env/bin/pip install tox

4
nodepool/elements/nodepool-base/install.d/91-venv-os-testr
View File

@ -22,8 +22,8 @@ python3 -m venv /usr/os-testr-env
if [[ ${DIB_RELEASE} == 'xenial' ]]; then
# The pip on xenial can't figure out it shouldn't install
# the latest pip; this is the last to support 3.5
/usr/bindep-env/bin/pip install --upgrade pip==20.3.4
/usr/os-testr-env/bin/pip install --upgrade pip==20.3.4
else
/usr/bindep-env/bin/pip install --upgrade pip
/usr/os-testr-env/bin/pip install --upgrade pip
fi
/usr/os-testr-env/bin/pip install os-testr