diff options
Diffstat (limited to 'xci')
| -rw-r--r-- | xci/files/install-lib.sh | 3 | ||||
| -rwxr-xr-x | xci/infra/bifrost/scripts/bifrost-provision.sh | 12 | ||||
| -rw-r--r-- | xci/opnfv-scenario-requirements.yml | 2 |
3 files changed, 14 insertions, 3 deletions
diff --git a/xci/files/install-lib.sh b/xci/files/install-lib.sh index cd9aa73e..43e1213e 100644 --- a/xci/files/install-lib.sh +++ b/xci/files/install-lib.sh @@ -149,6 +149,9 @@ ansible_lint() { # Extract role from scenario information local testing_role=$(sed -n "/^- scenario: ${DEPLOY_SCENARIO}/,/^$/p" ${XCI_PATH}/xci/opnfv-scenario-requirements.yml | grep role | rev | cut -d '/' -f -1 | rev) + # clear XCI_CACHE + rm -rf ${XCI_CACHE}/repos/openstack-ansible-tests + # Clone OSA rules too git clone --quiet --depth 1 https://github.com/openstack/openstack-ansible-tests.git \ ${XCI_CACHE}/repos/openstack-ansible-tests 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 diff --git a/xci/opnfv-scenario-requirements.yml b/xci/opnfv-scenario-requirements.yml index 5f82539d..925789a9 100644 --- a/xci/opnfv-scenario-requirements.yml +++ b/xci/opnfv-scenario-requirements.yml @@ -77,7 +77,7 @@ - scenario: os-odl-bgpvpn scm: git src: https://gerrit.opnfv.org/gerrit/sdnvpn - version: master + version: 6.0.0 role: scenarios/os-odl-bgpvpn/role/os-odl-bgpvpn installers: - installer: osa |