summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGary Wu <gary.i.wu@huawei.com>2017-12-08 20:19:30 -0800
committerGary Wu <gary.i.wu@huawei.com>2017-12-08 20:25:13 -0800
commit73fc63427f511267f524198b9bf410e9b51351bd (patch)
treeb6d1127a256db29d7b0f4b0b41b35fac5cad0dc1
parentdec0baa317b55fdda4f8b668eae835b6ac971286 (diff)
Avoid git pull failure when workdir has changes
Change-Id: I1f304307b1c5dd25a2aa483e0ead3a28f2111a68 Issue-ID: INT-278 Signed-off-by: Gary Wu <gary.i.wu@huawei.com>
-rwxr-xr-xtest/ete/scripts/install_openstack_cli.sh2
1 files changed, 1 insertions, 1 deletions
diff --git a/test/ete/scripts/install_openstack_cli.sh b/test/ete/scripts/install_openstack_cli.sh
index 60ca1541c..558efa2e2 100755
--- a/test/ete/scripts/install_openstack_cli.sh
+++ b/test/ete/scripts/install_openstack_cli.sh
@@ -45,7 +45,7 @@ if [ ! -d ${ONAP_WORKDIR}/demo ]; then
else
pushd ${ONAP_WORKDIR}/demo
git checkout amsterdam
+ git reset --hard
git pull
popd
fi
-