aboutsummaryrefslogtreecommitdiffstats
path: root/build.sh
diff options
context:
space:
mode:
authorbaigk <baiguoku@huawei.com>2015-10-09 18:32:31 +0800
committerbaigk <baiguoku@huawei.com>2015-10-10 10:17:48 +0800
commit80c770bb093ad2af54171de1a2c4630536d4daf0 (patch)
tree693a483f4b4f02eb7dcd908691e2db67f7b6003c /build.sh
parent00aaaac786bcec0d2de7c14c4f3c5a89ba2553f5 (diff)
bugfix: libvirt_type should be kvm when host is barebetal mode
JIRA: COMPASS-81 Change-Id: Iba3cb182a3e461ab89eb40fdba7800b8b2a1fc3e Signed-off-by: baigk <baiguoku@huawei.com>
Diffstat (limited to 'build.sh')
-rwxr-xr-xbuild.sh6
1 files changed, 1 insertions, 5 deletions
diff --git a/build.sh b/build.sh
index 88308190..7151317a 100755
--- a/build.sh
+++ b/build.sh
@@ -32,8 +32,7 @@ function download_git()
file_dir=$CACHE_DIR/${1%.*}
if [[ -d $file_dir/.git ]]; then
cd $file_dir
- git fetch origin master
- git checkout origin/master
+ git pull origin master
cd -
else
rm -rf $CACHE_DIR/$file_dir
@@ -74,9 +73,6 @@ function download_packages()
download_local $name $i
fi
done
-
- git fetch
- git checkout origin/master -- $COMPASS_DIR/deploy/adapters
}
function copy_file()