From: Markos Chandras Date: Mon, 26 Mar 2018 08:05:37 +0000 (+0100) Subject: xci: infra: bifrost: Define more XCI variables for bifrost jobs X-Git-Tag: 6.0.0~71^2 X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=8eb1639a8244924fdd6469d6835d285a5c60457d;p=releng-xci.git xci: infra: bifrost: Define more XCI variables for bifrost jobs This is similar to eeb906a553d6ddf70ffc5af1acadb33a13ff5990 ("xci: infra: bifrost: Set XCI_DISTRO if it's not defined") so we need to define more XCI variables if we are running the standalone bifrost jobs. Change-Id: I112cfbfdda677174bdb0d0afef73f035c74cb79e Signed-off-by: Markos Chandras --- diff --git a/xci/infra/bifrost/scripts/bifrost-provision.sh b/xci/infra/bifrost/scripts/bifrost-provision.sh index 2d773227..f9e83480 100755 --- a/xci/infra/bifrost/scripts/bifrost-provision.sh +++ b/xci/infra/bifrost/scripts/bifrost-provision.sh @@ -27,6 +27,9 @@ 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_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,,})} # set UPPER_CONSTRAINTS_FILE since it is needed in order to limit libvirt-python to 4.0.0