diff options
| author |   Fatih Degirmenci <fdegir@gmail.com> | 2018-03-23 21:27:43 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@opnfv.org> | 2018-03-23 21:27:43 +0000 |
| commit | 792dc36e891e427de0652d7941f6c347367e996e (patch) | |
| tree | 5476d4dc7ff0801b67d0108507eb24351194f346 /xci/infra/bifrost | |
| parent | d1fa862ec0f4b75f40eeb08e65aa222241c275a0 (diff) | |
| parent | 434466fafd40485eefba1c59af105ecf793a3c25 (diff) | |
Merge "xci: install: Move all pip installations to virtualenv"
Diffstat (limited to 'xci/infra/bifrost')
| -rwxr-xr-x | xci/infra/bifrost/scripts/bifrost-provision.sh | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/xci/infra/bifrost/scripts/bifrost-provision.sh b/xci/infra/bifrost/scripts/bifrost-provision.sh index e1a7e57c..2d773227 100755 --- a/xci/infra/bifrost/scripts/bifrost-provision.sh +++ b/xci/infra/bifrost/scripts/bifrost-provision.sh @@ -13,7 +13,8 @@ set -o pipefail export PYTHONUNBUFFERED=1 SCRIPT_HOME="$(cd "$(dirname "$0")" && pwd)" BIFROST_HOME=$SCRIPT_HOME/.. -ENABLE_VENV="false" +ENABLE_VENV="true" +export VENV=${XCI_VENV}/bifrost PROVISION_WAIT_TIMEOUT=${PROVISION_WAIT_TIMEOUT:-3600} # This is normally exported by XCI env but we should initialize it here # in case we run this script on its own for debug purposes @@ -97,7 +98,7 @@ if [[ -e ${XCI_PATH}/deployment_image.qcow2 ]]; then fi # Install missing dependencies -$(which pip) install -q --user --upgrade -r "$(dirname $0)/../requirements.txt" +pip install -q --upgrade -r "$(dirname $0)/../requirements.txt" # Change working directory cd $BIFROST_HOME/playbooks |