diff options
| author |   Markos Chandras <mchandras@suse.de> | 2018-03-28 09:36:55 +0100 |
|---|---|---|
| committer | Markos Chandras <mchandras@suse.de> | 2018-03-28 09:36:55 +0100 |
| commit | 17eb953055bee3ae828ab839ec1bca5e28189222 (patch) | |
| tree | 8252c867217953ffa32b73a2f993c15b9894cfd6 | |
| parent | 90cce1c977844b134ba90f89eefcf3d2ac12c5fc (diff) | |
xci: infra: bifrost: Make sure XCI variables are defined first
It's best to define all the XCI variables before everything else
to ensure that all subsequent bifrost variables are properly
defined.
Change-Id: Id4a9e0c89e8dd32b852cfef6b9bb336c4b75f5a7
Signed-off-by: Markos Chandras <mchandras@suse.de>
| -rwxr-xr-x | xci/infra/bifrost/scripts/bifrost-provision.sh | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/xci/infra/bifrost/scripts/bifrost-provision.sh b/xci/infra/bifrost/scripts/bifrost-provision.sh index f9e83480..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,13 +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_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 export UPPER_CONSTRAINTS_FILE=https://git.openstack.org/cgit/openstack/requirements/plain/upper-constraints.txt |