summaryrefslogtreecommitdiffstats
path: root/xci/scripts
diff options
context:
space:
mode:
authorMarkos Chandras <mchandras@suse.de>2017-06-29 09:46:32 +0100
committerTrevor Bramwell <tbramwell@linuxfoundation.org>2017-08-11 12:56:12 -0700
commitb1920aac779aeff50016c7b89e124bdef6edb74e (patch)
treed4bb3813efaf5fab6608ec4b950888395d4a4f76 /xci/scripts
parentdeceaa484e223045c4b07323895fa8f09e330846 (diff)
prototypes: xci: update-osa-version-files: Add support for updating bifrost SHAs
Add a second optional argument to update the bifrost SHA instead of doing this bit manually. Change-Id: I0fab8745ae08ad4f54a2a1f5b0b7a64fde4b8295 Signed-off-by: Markos Chandras <mchandras@suse.de>
Diffstat (limited to 'xci/scripts')
-rwxr-xr-xxci/scripts/update-osa-version-files.sh11
1 files changed, 8 insertions, 3 deletions
diff --git a/xci/scripts/update-osa-version-files.sh b/xci/scripts/update-osa-version-files.sh
index 7df020c1..7eed4b7d 100755
--- a/xci/scripts/update-osa-version-files.sh
+++ b/xci/scripts/update-osa-version-files.sh
@@ -9,7 +9,8 @@
##############################################################################
# This script is used to pin the SHAs for the various roles in the
-# ansible-role-requirements file
+# ansible-role-requirements file. It will also update the SHAs for
+# OSA and bifrost.
set -e
@@ -18,7 +19,7 @@ releng_xci_base="$(dirname $(readlink -f $0))/.."
usage() {
echo """
- ${0} <openstack-ansible commit SHA>
+ ${0} <openstack-ansible commit SHA> [<bifrost commit SHA>]
"""
exit 0
}
@@ -32,7 +33,7 @@ printme() {
}
# Only need a single argument
-[[ $# -ne 1 ]] && echo "Invalid number of arguments!" && usage
+[[ $# -lt 1 || $# -gt 2 ]] && echo "Invalid number of arguments!" && usage
tempdir="$(mktemp -d)"
@@ -71,6 +72,10 @@ cat $tempdir/openstack-ansible/ansible-role-requirements.yml >> $releng_xci_base
# Update the pinned OSA version
sed -i "/^export OPENSTACK_OSA_VERSION/s@:-\"[a-z0-9]*@:-\"${1}@" $releng_xci_base/config/pinned-versions
+# Update the pinned bifrost version
+[[ -n ${2:-} ]] && \
+ sed -i "/^export OPENSTACK_BIFROST_VERSION/s@:-\"[a-z0-9]*@:-\"${2}@" $releng_xci_base/config/pinned-versions
+
popd &> /dev/null
printme ""