[jenkins] - add the branchname to the package names

1 files changed, 14 insertions, 2 deletions

diff --git a/tools/buildsteps/defaultenv b/tools/buildsteps/defaultenv
index 4754b97831..8280cbdb35 100644
--- a/tools/buildsteps/defaultenv
+++ b/tools/buildsteps/defaultenv
@@ -105,8 +105,20 @@ function tagSuccessFulBuild ()
 
 function getBuildRevDateStr ()
 {
-  git --no-pager log --abbrev=7 -n 1 --pretty=format:"%h %ci" HEAD | awk '{gsub("-", "");print $2"-"$1}' 2>/dev/null
-  if [ "$?" != "0" ]; then
+  local revStr
+  #fetch date-rev
+  revStr=`git --no-pager log --abbrev=7 -n 1 --pretty=format:"%h %ci" HEAD | awk '{gsub("-", "");print $2"-"$1}' 2>/dev/null`
+  if [ "$?" == "0" ]
+  then
+    #fetch the first branch containing head
+    revStr=$revStr"-"`git branch -r --contains HEAD | head -n1 | awk '{gsub(".*/","");print $1}'`
+    if [ "$?" == "0" ]
+    then
+      echo $revStr
+    else
+      echo "Unknown"
+    fi
+  else
     echo "Unknown"
   fi
 }