diff options
| author |   Fatih Degirmenci <fatih.degirmenci@ericsson.com> | 2017-03-22 23:04:54 +0100 |
|---|---|---|
| committer |   Trevor Bramwell <tbramwell@linuxfoundation.org> | 2017-08-11 12:56:12 -0700 |
| commit | 0d757c4e25c459fbd5502e22c1d076627310edab (patch) | |
| tree | bcb706dc179bd64b54c91c7aff8109bc32f21c62 /bifrost | |
| parent | 9c10611b116547df395c65e16a520d42959c1eb5 (diff) | |
xci: Make it possible to select component versions
By replacing the branch with version, we now can specify sha1s
per project; opnfv/releng, openstack-ansible, and bifrost.
If nothing is specified manually (or via promotion), the defaults
will be set to branches, master and stable/ocata.
Change also includes further logging.
Change-Id: Iae0f8cc60391caeb0f2735610050007014374a70
Signed-off-by: Fatih Degirmenci <fatih.degirmenci@ericsson.com>
Diffstat (limited to 'bifrost')
| -rwxr-xr-x | bifrost/scripts/osa-bifrost-deployment.sh | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/bifrost/scripts/osa-bifrost-deployment.sh b/bifrost/scripts/osa-bifrost-deployment.sh index 33ad1088..fb66ae9e 100755 --- a/bifrost/scripts/osa-bifrost-deployment.sh +++ b/bifrost/scripts/osa-bifrost-deployment.sh @@ -20,11 +20,9 @@ USE_VENV="false" BUILD_IMAGE=true PROVISION_WAIT_TIMEOUT=${PROVISION_WAIT_TIMEOUT:-3600} -# ensure the branch is set -export OPENSTACK_BRANCH=${OPENSTACK_BRANCH:-master} - # ensure the right inventory files is used based on branch -if [ $OPENSTACK_BRANCH = "master" ]; then +CURRENT_BIFROST_BRANCH=$(git rev-parse --abbrev-ref HEAD) +if [ $CURRENT_BIFROST_BRANCH = "master" ]; then export BIFROST_INVENTORY_SOURCE=${BIFROST_INVENTORY_SOURCE:-'/tmp/baremetal.json'} else export BIFROST_INVENTORY_SOURCE=${BIFROST_INVENTORY_SOURCE:-'/tmp/baremetal.csv'} |