diff options
| author |   Markos Chandras <mchandras@suse.de> | 2018-04-19 15:44:10 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@opnfv.org> | 2018-04-19 15:44:10 +0000 |
| commit | 59678e0bad4c4572d6a2933d60e996bcbdad3aa1 (patch) | |
| tree | 64551c7445e22062d9bf51a354ac65ca8783e7ed | |
| parent | 73f5018ee500401e774c42ea8f32b8db8a5146fd (diff) | |
| parent | ea3316fdbaedc16af08219a10eba9a83269e51b7 (diff) | |
Merge "xci: infra: bifrost: Use XCI virtual environment for bifrost"
| -rwxr-xr-x | xci/infra/bifrost/scripts/bifrost-provision.sh | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/xci/infra/bifrost/scripts/bifrost-provision.sh b/xci/infra/bifrost/scripts/bifrost-provision.sh index f653a2fd..940e9439 100755 --- a/xci/infra/bifrost/scripts/bifrost-provision.sh +++ b/xci/infra/bifrost/scripts/bifrost-provision.sh @@ -21,7 +21,7 @@ export PYTHONUNBUFFERED=1 SCRIPT_HOME="$(cd "$(dirname "$0")" && pwd)" BIFROST_HOME=$SCRIPT_HOME/.. ENABLE_VENV="true" -export VENV=${XCI_VENV}/bifrost +export VENV=${XCI_VENV} 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 @@ -102,7 +102,15 @@ fi # Install missing dependencies. Use sudo since for bifrost jobs # the venv is not ready yet. -[[ -n ${VIRTUAL_ENV:-} ]] && _sudo="" || _sudo="sudo -H -E" +if [[ -n ${VIRTUAL_ENV:-} ]]; then + _sudo="" +else + virtualenv --quiet --no-site-packages ${XCI_VENV} + set +u + source ${XCI_VENV}/bin/activate + set -u + _sudo="sudo -H -E" +fi ${_sudo} pip install -q --upgrade -r "$(dirname $0)/../requirements.txt" # Change working directory |