[geode-benchmarks] branch develop updated: Always cleanup benchmark directory.

[jb...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

jbarrett pushed a commit to branch develop
in repository https://gitbox.apache.org/repos/asf/geode-benchmarks.git


The following commit(s) were added to refs/heads/develop by this push:
     new 96088e5  Always cleanup benchmark directory.
96088e5 is described below

commit 96088e5e0615dd775bbca7b55ac07da398f4fdc4
Author: Jacob Barrett <jb...@pivotal.io>
AuthorDate: Thu Apr 18 15:58:22 2019 -0700

    Always cleanup benchmark directory.
---
 infrastructure/scripts/aws/run_tests.sh | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/infrastructure/scripts/aws/run_tests.sh b/infrastructure/scripts/aws/run_tests.sh
index f646ce4..f8eae10 100755
--- a/infrastructure/scripts/aws/run_tests.sh
+++ b/infrastructure/scripts/aws/run_tests.sh
@@ -17,7 +17,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-set -e -o pipefail
+set -x -e -o pipefail
 
 DEFAULT_BENCHMARK_REPO='https://github.com/apache/geode-benchmarks'
 BENCHMARK_REPO=${DEFAULT_BENCHMARK_REPO}
@@ -199,9 +199,10 @@ set -e
 instance_id=$(ssh ${SSH_OPTIONS} geode@$FIRST_INSTANCE cat .geode-benchmarks-identifier)
 
 
-ssh ${SSH_OPTIONS} geode@${FIRST_INSTANCE} "\
-  [ ! -d geode-benchmarks ] && git clone ${BENCHMARK_REPO}; \
-  cd geode-benchmarks && git fetch --all && git checkout ${BENCHMARK_BRANCH} && git pull"
+ssh ${SSH_OPTIONS} geode@${FIRST_INSTANCE} \
+  rm -rf geode-benchmarks '&&' \
+  git clone ${BENCHMARK_REPO} '&&' \
+  cd geode-benchmarks '&&' git checkout ${BENCHMARK_BRANCH}
 
 BENCHMARK_SHA=$(ssh ${SSH_OPTIONS} geode@${FIRST_INSTANCE} \
   cd geode-benchmarks '&&' \