From: Gary Wu <gary.i.wu@huawei.com>
Date: Sat, 9 Dec 2017 04:19:30 +0000 (-0800)
Subject: Avoid git pull failure when workdir has changes
X-Git-Tag: 1.0.1-Amsterdam~43
X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;h=73fc63427f511267f524198b9bf410e9b51351bd;p=integration.git

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>
---

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
-