diff options
| author |   Markos Chandras <mchandras@suse.de> | 2018-08-31 11:14:51 +0100 |
|---|---|---|
| committer | Markos Chandras <mchandras@suse.de> | 2018-08-31 15:37:44 +0100 |
| commit | a8f65dd6f72e5ded2a652a892c43b47f16fb5610 (patch) | |
| tree | 32a110ef64dc0413128b4cc229c957a8f4d9a723 /xci/scripts | |
| parent | eda0bccec5fdf21b5ac29fb1c0788473076fafa3 (diff) | |
xci: Bump Bifrost components to the HEAD of Rocky release
The bifrost and ironic SHAs are from the Stein release which is still
in early days of development. We should use Rocky SHAs for the time
being. However, bifrost from Rocky does not support Ansible > 2.4 so
we have to use bifrost from master branch but all the ironic components
have to be from the Rocky release.
Change-Id: I1acb28e4a292c774d681519517be19a2da230851
Signed-off-by: Markos Chandras <mchandras@suse.de>
Diffstat (limited to 'xci/scripts')
| -rwxr-xr-x | xci/scripts/update-osa-version-files.sh | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/xci/scripts/update-osa-version-files.sh b/xci/scripts/update-osa-version-files.sh index 42405a3f..3ed2e182 100755 --- a/xci/scripts/update-osa-version-files.sh +++ b/xci/scripts/update-osa-version-files.sh @@ -76,20 +76,20 @@ cat $tempdir/openstack-ansible/ansible-role-requirements.yml >> $releng_xci_base # Update the pinned OSA version sed -i -e "/^export OPENSTACK_OSA_VERSION/s@:-\"[a-z0-9]*@:-\"${1}@" \ - -e "s/\(^# HEAD of osa.*of \).*/\1$(date +%d\.%m\.%Y)/" $releng_xci_base/config/pinned-versions + -e "s/\(^# HEAD of osa \).*/\1\"${OPENSTACK_OSA_VERSION:-master}\" as of $(date +%d\.%m\.%Y)/" $releng_xci_base/config/pinned-versions # Update the pinned bifrost version if [[ -n ${2:-} ]]; then echo "Updating bifrost..." sed -i -e "/^export OPENSTACK_BIFROST_VERSION/s@:-\"[a-z0-9]*@:-\"${2}@" \ - -e "s/\(^# HEAD of bifrost.*of \).*/\1$(date +%d\.%m\.%Y)/" $releng_xci_base/config/pinned-versions + -e "s/\(^# HEAD of bifrost \).*/\1\"${OPENSTACK_OSA_VERSION:-master}\" as of $(date +%d\.%m\.%Y)/" $releng_xci_base/config/pinned-versions # Get ironic shas for ironic in ironic_git_url ironic_client_git_url ironic_inspector_git_url ironic_inspector_client_git_url; do - ironic_sha=$(git ls-remote ${!ironic} | grep master | awk '{print $1}') + ironic_sha=$(git ls-remote ${!ironic} | grep "${OPENSTACK_OSA_VERSION:-master}" | awk '{print $1}') ironic=${ironic/_git*/} echo "... updating ${ironic}" sed -i -e "/^export BIFROST_${ironic^^}_VERSION/s@:-\"[a-z0-9]*@:-\"${ironic_sha}@" \ - -e "s/\(^# HEAD of ${ironic/_/-}.*of \).*/\1$(date +%d\.%m\.%Y)/" $releng_xci_base/config/pinned-versions + -e "s/\(^# HEAD of ${ironic/_/-} \).*/\1\"${OPENSTACK_OSA_VERSION:-master}\" as of $(date +%d\.%m\.%Y)/" $releng_xci_base/config/pinned-versions done fi |