Update CSIT test 160727 -> 160731

[vpp.git] / build-root / scripts / version

diff --git a/build-root/scripts/version b/build-root/scripts/version
index 9d236bc..84ee5db 100755 (executable)
--- a/build-root/scripts/version
+++ b/build-root/scripts/version
@@ -4,6 +4,10 @@ TAG=$(git describe | cut -d- -f1 | sed -e 's/^v//')
 ADD=$(git describe | cut -s -d- -f2)
 CMT=$(git describe --dirty --match 'v*'| cut -s -d- -f3,4)
 
+if [ -n "${BUILD_NUMBER}" ]; then
+       BLD="~b${BUILD_NUMBER}"
+fi
+
 if [ "$1" = "rpm-version" ]; then
   echo ${TAG}
   exit
@@ -11,12 +15,13 @@ fi
 
 if [ "$1" = "rpm-release" ]; then
   [ -z "${ADD}" ] && echo release && exit
-  echo ${ADD}~${CMT}
+  CMT=$(git describe --dirty --match 'v*'| cut -s -d- -f3,4 | sed 's/-/_/')
+  echo ${ADD}${CMT:+~${CMT}}${BLD}
   exit
 fi
 
 if [ -n "${ADD}" ]; then
-  echo ${TAG}-${ADD}~${CMT}
+  echo ${TAG}-${ADD}${CMT:+~${CMT}}${BLD}
 else
   echo ${TAG}
 fi