X-Git-Url: https://gerrit.nordix.org/gitweb?a=blobdiff_plain;f=jjb%2Fgeode%2Fapache-geode-build%2Fset_geode_build_version.sh;h=2de958a7b5482a851336e0493e60130a31213863;hb=b271d83874ec8436b66671ea28e8ea40f9176887;hp=c597b8bf812994fbd73008dd14b23ad8ceaca46d;hpb=5fe5de7dbaf93789b5fd852e7e711a388a034f07;p=infra%2Fcicd.git

diff --git a/jjb/geode/apache-geode-build/set_geode_build_version.sh b/jjb/geode/apache-geode-build/set_geode_build_version.sh
index c597b8bf..2de958a7 100755
--- a/jjb/geode/apache-geode-build/set_geode_build_version.sh
+++ b/jjb/geode/apache-geode-build/set_geode_build_version.sh
@@ -23,9 +23,16 @@ set -o pipefail
 
 cd $WORKSPACE/geode
 
-# Get most recent tag that is reachable from a commit
-GEODE_VERSION=$(git describe  | sed -r "s#rel/v(.*)#\1#")
+# Get most recent tag that is reachable from a commit on current branch
+GEODE_VERSION=$(git describe --abbrev=0 --tags | sed -r "s#rel/v(.*)#\1#")
+BUILD_DATE=$(date '+%Y%m%d%H%M')
 if [ ! -d ${WORKSPACE}/geode-build-version ] ; then
    mkdir ${WORKSPACE}/geode-build-version
 fi
-echo "$GEODE_VERSION" > ${WORKSPACE}/geode-build-version/number
+# Make sure the Geode tag version is in agreed format: \d.\d.\d.\d.[RC\d]?
+if [[ ${GEODE_VERSION} =~ ^[0-9]+\.[0-9]+\.[0-9]+\.[0-9]+(\.RC[0-9]+)?$ ]] ; then
+  echo "${GEODE_VERSION}-NORDIX.${BUILD_DATE}" > ${WORKSPACE}/geode-build-version/number
+else
+  echo "ERROR: Incorrect geode version specified: ${GEODE_VERSION}"
+  exit 1
+fi