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=8785eaaf4ff9b2e9c289a3f46f0336c717e83ef7;hp=4028771b5b3a45f28200a2f48b680c41235ae0c1;hpb=0c8e2ecf8970949b141435767869895793055619;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 4028771b..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,14 +23,14 @@ set -o pipefail
 
 cd $WORKSPACE/geode
 
-# Get most recent tag that is reachable from a commit
-GEODE_VERSION=$(git describe --abbrev=0 | 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
-# Make sure the Geode tag version is in agreed fromat: \d.\d.\d.[ \d or RC\d ]
-if [[ ${GEODE_VERSION} =~ ^[0-9]+\.[0-9]+\.[0-9]+\.(RC[0-9]+|[0-9]+)$ ]] ; then
+# 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}"