Code Review
/
bottlenecks.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Scripts update to run rubbos on compass4nfv env 3
[bottlenecks.git]
/
utils
/
infra_setup
/
vm_dev_setup
/
setup_env.sh
diff --git
a/utils/infra_setup/vm_dev_setup/setup_env.sh
b/utils/infra_setup/vm_dev_setup/setup_env.sh
index
1ddab5d
..
bfc8f72
100755
(executable)
--- 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()
{
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
# branch, tag or sha1 object
- git checkout $1
+
sudo
git checkout $1
else
# refspec / changeset
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
}
fi
}
@@
-69,12
+69,12
@@
bottlenecks_download_repo()
sudo git config --global http.sslVerify false
if [ ! -d $BOTTLENECKS_REPO_DIR ]; then
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
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
git_checkout $BOTTLENECKS_BRANCH $BOTTLENECKS_REPO
- cd -
+
sudo
cd -
}
bottlenecks_config_hosts_ip()
}
bottlenecks_config_hosts_ip()