summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMarkos Chandras <mchandras@suse.de>2017-07-03 09:37:17 +0100
committerMarkos Chandras <mchandras@suse.de>2017-07-03 09:37:17 +0100
commit791c723db42bf7e011d04ca5fb2a9f0e019700b4 (patch)
tree4fcd22bdab3eaf91f1264be5aec983214a404a95
parentcaf114d6802cf8af708d5caa7ea7e0333d0f1bfd (diff)
prototypes: xci: scripts: Update SHA dates
Update the dates in the pinned-versions file whenever we update the SHAs. Change-Id: I23ebd90a3fc688a7501fcb2d32217357f8c31657 Signed-off-by: Markos Chandras <mchandras@suse.de>
-rwxr-xr-xprototypes/xci/config/pinned-versions4
-rwxr-xr-xprototypes/xci/scripts/update-osa-version-files.sh6
2 files changed, 6 insertions, 4 deletions
diff --git a/prototypes/xci/config/pinned-versions b/prototypes/xci/config/pinned-versions
index 40f73bd01..581786075 100755
--- a/prototypes/xci/config/pinned-versions
+++ b/prototypes/xci/config/pinned-versions
@@ -21,7 +21,7 @@
#-------------------------------------------------------------------------------
# use releng from master until the development work with the sandbox is complete
export OPNFV_RELENG_VERSION="master"
-# HEAD of "master" as of 29.06.2017
+# HEAD of bifrost "master" as of 29.06.2017
export OPENSTACK_BIFROST_VERSION=${OPENSTACK_BIFROST_VERSION:-"7c9bb5e07c6bc3b42c9a9e8457e5eef511075b38"}
-# HEAD of "master" as of 29.06.2017
+# HEAD of osa "master" as of 29.06.2017
export OPENSTACK_OSA_VERSION=${OPENSTACK_OSA_VERSION:-"0648818c64239b534d00db381c4609f28e40bda9"}
diff --git a/prototypes/xci/scripts/update-osa-version-files.sh b/prototypes/xci/scripts/update-osa-version-files.sh
index 7eed4b7d4..d822d2575 100755
--- a/prototypes/xci/scripts/update-osa-version-files.sh
+++ b/prototypes/xci/scripts/update-osa-version-files.sh
@@ -70,11 +70,13 @@ echo """---
cat $tempdir/openstack-ansible/ansible-role-requirements.yml >> $releng_xci_base/file/ansible-role-requirements.yml
# Update the pinned OSA version
-sed -i "/^export OPENSTACK_OSA_VERSION/s@:-\"[a-z0-9]*@:-\"${1}@" $releng_xci_base/config/pinned-versions
+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
# Update the pinned bifrost version
[[ -n ${2:-} ]] && \
- sed -i "/^export OPENSTACK_BIFROST_VERSION/s@:-\"[a-z0-9]*@:-\"${2}@" $releng_xci_base/config/pinned-versions
+ 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
popd &> /dev/null