From e17d562000b4dd522eda0e1da450f5060fd7c6e6 Mon Sep 17 00:00:00 2001 From: Alfredo Moralejo Date: Wed, 12 Feb 2020 09:39:49 +0000 Subject: [PATCH] Revert "Use virtualenv --seeder=pip so that libs are accessible" --seeder=pip is breaking images where pip is not installed from source. New virtualenv upstream release 20.0.2 has fixed the issue seen when using sudo [1] by copying instead of symlinking and does not need this fix anymore. [1] https://github.com/pypa/virtualenv/commit/f4fd6a09916f26dc797a75698c53bbb95e48748e This reverts commit be9530ae163b8f27b219c4122c3583436c36e107. Change-Id: I799982d9c023141cf612901084d4ecbd4447e969 --- .../elements/infra-package-needs/install.d/40-install-bindep | 2 +- nodepool/elements/nodepool-base/install.d/91-venv-os-testr | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) 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 85c9d1d07b..88150c9c97 100755 --- a/nodepool/elements/infra-package-needs/install.d/40-install-bindep +++ b/nodepool/elements/infra-package-needs/install.d/40-install-bindep @@ -22,5 +22,5 @@ if [ ${DIB_DEBUG_TRACE:-0} -gt 0 ]; then fi set -e -$DIB_PYTHON_VIRTUALENV --seeder=pip /usr/bindep-env +$DIB_PYTHON_VIRTUALENV /usr/bindep-env /usr/bindep-env/bin/pip install bindep 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 0a5e315d24..09d3f75d53 100755 --- a/nodepool/elements/nodepool-base/install.d/91-venv-os-testr +++ b/nodepool/elements/nodepool-base/install.d/91-venv-os-testr @@ -18,6 +18,5 @@ if [ ${DIB_DEBUG_TRACE:-0} -gt 0 ]; then fi set -e -# TODO is this used anymore? -$DIB_PYTHON_VIRTUALENV --seeder=pip /usr/os-testr-env +$DIB_PYTHON_VIRTUALENV /usr/os-testr-env /usr/os-testr-env/bin/pip install os-testr