X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=utils%2Finfra_setup%2Fvm_dev_setup%2Fsetup_env.sh;h=bfc8f724729e5bbb2ac734744f452a6c6279d693;hb=077a600603f855ed50bba52ad11db0bc51a11594;hp=1ddab5de2c6c4ccaa0fda960fee50fe9dcfdc5fd;hpb=d519fff9ff4adaece9e3cc221800169602f58fec;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 1ddab5de..bfc8f724 100755 --- a/utils/infra_setup/vm_dev_setup/setup_env.sh +++ b/utils/infra_setup/vm_dev_setup/setup_env.sh @@ -53,13 +53,13 @@ bottlenecks_prepare_env() git_checkout() { - if git cat-file -e $1^{commit} 2>/dev/null; then + if sudo git cat-file -e $1^{commit} 2>/dev/null; then # branch, tag or sha1 object - git checkout $1 + sudo git checkout $1 else # refspec / changeset - git fetch --tags --progress $2 $1 - git checkout FETCH_HEAD + sudo git fetch --tags --progress $2 $1 + sudo git checkout FETCH_HEAD fi } @@ -69,12 +69,12 @@ bottlenecks_download_repo() sudo git config --global http.sslVerify false if [ ! -d $BOTTLENECKS_REPO_DIR ]; then - git clone $BOTTLENECKS_REPO $BOTTLENECKS_REPO_DIR + sudo git clone $BOTTLENECKS_REPO $BOTTLENECKS_REPO_DIR fi - cd $BOTTLENECKS_REPO_DIR - git checkout master && git pull + sudo cd $BOTTLENECKS_REPO_DIR + sudo git checkout master && sudo git pull git_checkout $BOTTLENECKS_BRANCH $BOTTLENECKS_REPO - cd - + sudo cd - } bottlenecks_config_hosts_ip()