From 997486eff65c298ff5ea7d6de03e4f0269b7698a Mon Sep 17 00:00:00 2001 From: Matthew Thode Date: Mon, 10 Sep 2018 18:11:19 -0500 Subject: [PATCH] remove sudo from pip and virtualenv calls Change-Id: I2f8ea4260c82d8623c74b8ac6355d9eb5f6698e9 --- .../infra-package-needs/install.d/40-install-bindep | 4 ++-- nodepool/elements/nodepool-base/install.d/91-venv-os-testr | 7 ++----- 2 files changed, 4 insertions(+), 7 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 a19ae97185..a166a2e51e 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 -sudo -H virtualenv /usr/bindep-env -sudo -H /usr/bindep-env/bin/pip install bindep +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 098ac83a55..5386ee08b4 100755 --- a/nodepool/elements/nodepool-base/install.d/91-venv-os-testr +++ b/nodepool/elements/nodepool-base/install.d/91-venv-os-testr @@ -18,8 +18,5 @@ if [ ${DIB_DEBUG_TRACE:-0} -gt 0 ]; then fi set -e -# Create a virtualenv for os-testr (which contains subunit2html) -# This is in /usr instead of /usr/local due to this bug on precise: -# https://bugs.launchpad.net/ubuntu/+source/python2.7/+bug/839588 -sudo -H virtualenv /usr/os-testr-env -sudo -H /usr/os-testr-env/bin/pip install os-testr +virtualenv /usr/os-testr-env +/usr/os-testr-env/bin/pip install os-testr