X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=utils%2Finfra_setup%2Fvm_dev_setup%2Fsetup_env.sh;fp=utils%2Finfra_setup%2Fvm_dev_setup%2Fsetup_env.sh;h=1ddab5de2c6c4ccaa0fda960fee50fe9dcfdc5fd;hb=0e5f71563fe8dd2a5e357b37d303331ee0f13c9d;hp=cef76f8e20e8e194d58d257b0f783ae9ea2253f2;hpb=189f49b2be3cb06ab1cc9db458d44cd5c8bc1936;p=bottlenecks.git

diff --git a/utils/infra_setup/vm_dev_setup/setup_env.sh b/utils/infra_setup/vm_dev_setup/setup_env.sh
index cef76f8e..1ddab5de 100755
--- a/utils/infra_setup/vm_dev_setup/setup_env.sh
+++ b/utils/infra_setup/vm_dev_setup/setup_env.sh
@@ -51,29 +51,30 @@ bottlenecks_prepare_env()
     done
 }
 
+git_checkout()
+{
+    if git cat-file -e $1^{commit} 2>/dev/null; then
+        # branch, tag or sha1 object
+        git checkout $1
+    else
+        # refspec / changeset
+        git fetch --tags --progress $2 $1
+        git checkout FETCH_HEAD
+    fi
+}
+
 bottlenecks_download_repo()
 {
     echo "Bottlenecks: download bottlenecks repo"
 
     sudo git config --global http.sslVerify false
-    if [ -d $BOTTLENECKS_REPO_DIR/.git ]; then
-        cd $BOTTLENECKS_REPO_DIR
-        sudo git pull origin master
-        if [ x"$GERRIT_REFSPEC_DEBUG" != x ]; then
-            sudo git fetch $BOTTLENECKS_REPO $GERRIT_REFSPEC_DEBUG && sudo git checkout FETCH_HEAD
-        fi
-        cd -
-    else
-        sudo rm -rf $BOTTLENECKS_REPO_DIR
-        sudo git clone $BOTTLENECKS_REPO $BOTTLENECKS_REPO_DIR
-        if [ x"$GERRIT_REFSPEC_DEBUG" != x ]; then
-            cd $BOTTLENECKS_REPO_DIR
-            echo "fetch $GERRIT_REFSPEC_DEBUG"
-            sudo git fetch $BOTTLENECKS_REPO $GERRIT_REFSPEC_DEBUG && sudo git checkout FETCH_HEAD
-            cd -
-        fi
-
+    if [ ! -d $BOTTLENECKS_REPO_DIR ]; then
+        git clone $BOTTLENECKS_REPO $BOTTLENECKS_REPO_DIR
     fi
+    cd $BOTTLENECKS_REPO_DIR
+    git checkout master && git pull
+    git_checkout $BOTTLENECKS_BRANCH $BOTTLENECKS_REPO
+    cd -
 }
 
 bottlenecks_config_hosts_ip()