diff options
| author |   Markos Chandras <mchandras@suse.de> | 2018-03-23 14:52:00 +0000 |
|---|---|---|
| committer | Markos Chandras <mchandras@suse.de> | 2018-03-23 14:52:00 +0000 |
| commit | eeb906a553d6ddf70ffc5af1acadb33a13ff5990 (patch) | |
| tree | 37cc0656a3ef0fc8fd47373a01fba81dc88961df | |
| parent | 88fc810539b0ecc6ffd74cd3de88de527221938c (diff) | |
xci: infra: bifrost: Set XCI_DISTRO if it's not defined
The XCI_DISTRO variable is normally set from the XCI deployment script.
However, on bifrost jobs, we don't run this script as part of XCI so we
need to ensure that this variable is set properly.
Change-Id: I295b65176bab6ccbdd12aa50449d3c021a88b43d
Signed-off-by: Markos Chandras <mchandras@suse.de>
| -rwxr-xr-x | xci/infra/bifrost/scripts/bifrost-provision.sh | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/xci/infra/bifrost/scripts/bifrost-provision.sh b/xci/infra/bifrost/scripts/bifrost-provision.sh index 939acb58..e1a7e57c 100755 --- a/xci/infra/bifrost/scripts/bifrost-provision.sh +++ b/xci/infra/bifrost/scripts/bifrost-provision.sh @@ -24,6 +24,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 |