diff --git a/nodepool/elements/infra-package-needs/install.d/40-install-bindep b/nodepool/elements/infra-package-needs/install.d/40-install-bindep index 67a86dc2d9..760acd2e9d 100755 --- a/nodepool/elements/infra-package-needs/install.d/40-install-bindep +++ b/nodepool/elements/infra-package-needs/install.d/40-install-bindep @@ -23,4 +23,7 @@ fi set -e python3 -m venv /usr/bindep-env +# We do this first to ensure working setuptools is present when bindep +# is installed. +/usr/bindep-env/bin/pip install -U 'setuptools<50' /usr/bindep-env/bin/pip install bindep diff --git a/nodepool/elements/infra-package-needs/install.d/40-install-tox b/nodepool/elements/infra-package-needs/install.d/40-install-tox index d5c3b09d92..5977a66e13 100755 --- a/nodepool/elements/infra-package-needs/install.d/40-install-tox +++ b/nodepool/elements/infra-package-needs/install.d/40-install-tox @@ -23,4 +23,7 @@ fi set -e python3 -m venv /usr/tox-env +# We do this first to ensure working setuptools is present when tox +# is installed. +/usr/tox-env/bin/pip install -U 'setuptools<50' /usr/tox-env/bin/pip install tox diff --git a/nodepool/elements/nodepool-base/install.d/91-venv-os-testr b/nodepool/elements/nodepool-base/install.d/91-venv-os-testr index ea96003c98..b2a2344eb9 100755 --- a/nodepool/elements/nodepool-base/install.d/91-venv-os-testr +++ b/nodepool/elements/nodepool-base/install.d/91-venv-os-testr @@ -19,4 +19,7 @@ fi set -e python3 -m venv /usr/os-testr-env +# We do this first to ensure working setuptools is present when os-testr +# is installed. +/usr/os-testr-env/bin/pip install -U 'setuptools<50' /usr/os-testr-env/bin/pip install os-testr