robot: adapt VIM test for RBAC environments

[osm/devops.git] / jenkins / common / git_functions

diff --git a/jenkins/common/git_functions b/jenkins/common/git_functions
index 7856623..e5b7984 100644 (file)
--- a/jenkins/common/git_functions
+++ b/jenkins/common/git_functions
@@ -2,8 +2,7 @@
 
 
 GIT() {
-
-       CMD git "$@"
+    CMD git "$@"
 }
 
 
@@ -13,14 +12,14 @@ OSM_git_checkout() {
     if [ -d $OSM_MDG ]; then
         INFO "reusing existing workspace"
         cd $OSM_MDG
-        GIT pull --all
+        GIT fetch --all --tags
         #git checkout master  #to make sure that we are in the right branch before pulling the code
         #git pull
     else
         INFO "cloning MDG $OSM_MDG from $OSM_GIT_URL/$OSM_MDG"
         GIT clone $OSM_GIT_URL/$OSM_MDG
         cd $OSM_MDG
-        for remote in `git branch -r`; do GIT branch --track ${remote#origin/} $remote; done
+        for remote in `git branch -r |grep -v /HEAD`; do GIT branch --track ${remote#origin/} $remote; done
     fi
     
     if [ $# -gt 0 ]; then
@@ -38,3 +37,4 @@ OSM_git_checkout() {
     fi
 
 }
+