diff options
Diffstat (limited to 'xci')
| -rw-r--r-- | xci/files/install-lib.sh | 4 | ||||
| -rwxr-xr-x | xci/infra/bifrost/scripts/bifrost-provision.sh | 4 |
2 files changed, 6 insertions, 2 deletions
diff --git a/xci/files/install-lib.sh b/xci/files/install-lib.sh index 5c2dd288..48233968 100644 --- a/xci/files/install-lib.sh +++ b/xci/files/install-lib.sh @@ -150,8 +150,8 @@ collect_xci_logs() { mkdir -p ${LOG_PATH}/ara/ ${LOG_PATH}/opnfv/ara rsync -q -a "${HOME}/.ara/ansible.sqlite" "${LOG_PATH}/ara/" - rsync -q -a root@${OPNFV_HOST_IP}:releng-xci/${LOG_PATH#$XCI_PATH/}/ ${LOG_PATH}/opnfv/ || true - rsync -q -a root@${OPNFV_HOST_IP}:.ara/ansible.sqlite ${LOG_PATH}/opnfv/ara/ || true + rsync -q -a root@${OPNFV_HOST_IP}:releng-xci/${LOG_PATH#$XCI_PATH/}/ ${LOG_PATH}/opnfv/ &> /dev/null || true + rsync -q -a root@${OPNFV_HOST_IP}:.ara/ansible.sqlite ${LOG_PATH}/opnfv/ara/ &> /dev/null || true sudo -H -E bash -c 'chown ${SUDO_UID}:${SUDO_GID} -R ${LOG_PATH}/' } diff --git a/xci/infra/bifrost/scripts/bifrost-provision.sh b/xci/infra/bifrost/scripts/bifrost-provision.sh index eedf350f..2d773227 100755 --- a/xci/infra/bifrost/scripts/bifrost-provision.sh +++ b/xci/infra/bifrost/scripts/bifrost-provision.sh @@ -25,6 +25,10 @@ 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 |