diff options
| -rwxr-xr-x | xci/infra/bifrost/scripts/bifrost-provision.sh | 11 | ||||
| -rw-r--r-- | xci/playbooks/get-opnfv-scenario-requirements.yml | 8 |
2 files changed, 15 insertions, 4 deletions
diff --git a/xci/infra/bifrost/scripts/bifrost-provision.sh b/xci/infra/bifrost/scripts/bifrost-provision.sh index 2d773227..2b849e34 100755 --- a/xci/infra/bifrost/scripts/bifrost-provision.sh +++ b/xci/infra/bifrost/scripts/bifrost-provision.sh @@ -10,6 +10,13 @@ set -eu set -o pipefail +# This is normally passed from the XCI deployment script but +# we also need it here for the bifrost jobs which run outside of XCI +export XCI_PATH="${XCI_PATH:-$(git rev-parse --show-toplevel)}" +# Declare our virtualenv +export XCI_VENV="${XCI_VENV:-${XCI_PATH}/venv/}" +export XCI_DISTRO=${XCI_DISTRO:-$(source /etc/os-release &>/dev/null || source /usr/lib/os-release &>/dev/null; echo ${ID,,})} + export PYTHONUNBUFFERED=1 SCRIPT_HOME="$(cd "$(dirname "$0")" && pwd)" BIFROST_HOME=$SCRIPT_HOME/.. @@ -25,10 +32,6 @@ BIFROST_IRONIC_INSPECTOR_CLIENT_VERSION=${BIFROST_IRONIC_INSPECTOR_CLIENT_VERSIO BIFROST_IRONIC_CLIENT_VERSION=${BIFROST_IRONIC_CLIENT_VERSION:-master} BIFROST_IRONIC_VERSION=${BIFROST_IRONIC_VERSION:-master} -# This is normally passed from the XCI deployment script but -# we also need it here for the bifrost jobs which run outside of XCI -export XCI_DISTRO=${XCI_DISTRO:-$(source /etc/os-release &>/dev/null || source /usr/lib/os-release &>/dev/null; echo ${ID,,})} - # set UPPER_CONSTRAINTS_FILE since it is needed in order to limit libvirt-python to 4.0.0 export UPPER_CONSTRAINTS_FILE=https://git.openstack.org/cgit/openstack/requirements/plain/upper-constraints.txt diff --git a/xci/playbooks/get-opnfv-scenario-requirements.yml b/xci/playbooks/get-opnfv-scenario-requirements.yml index 6572e278..f37de61a 100644 --- a/xci/playbooks/get-opnfv-scenario-requirements.yml +++ b/xci/playbooks/get-opnfv-scenario-requirements.yml @@ -78,6 +78,14 @@ synchronize: src: "{{ xci_path }}/xci/scenarios/{{ item.item.scenario }}/{{ item.item.role | replace('xci/scenarios/' ~ item.item.scenario ~ '/', '') }}/" dest: "{{ role_path_default }}/{{ item.item.role | basename }}" + archive: no + times: no + recurse: yes + checksum: yes + owner: yes + group: yes + perms: yes + links: yes failed_when: false when: - item.stat.exists |