[geode-benchmarks] branch develop updated: Fix defaults and dependencies. (#45)

[sm...@apache.org]

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

smgoller 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 e963cdb  Fix defaults and dependencies. (#45)
e963cdb is described below

commit e963cdb989d808c42817a9c31176877317a002e7
Author: Sean Goller <se...@goller.net>
AuthorDate: Thu Jan 17 14:37:46 2019 -0800

    Fix defaults and dependencies. (#45)
    
    * Add default for branch under test
    * Fetch dependencies before running benchmarks.
    
    Authored-by: Sean Goller <sg...@pivotal.io>
---
 infrastructure/scripts/aws/run_against_baseline.sh |  1 +
 infrastructure/scripts/aws/run_tests.sh            | 14 +++++++++++++-
 2 files changed, 14 insertions(+), 1 deletion(-)

diff --git a/infrastructure/scripts/aws/run_against_baseline.sh b/infrastructure/scripts/aws/run_against_baseline.sh
index b4be318..9ba7c86 100755
--- a/infrastructure/scripts/aws/run_against_baseline.sh
+++ b/infrastructure/scripts/aws/run_against_baseline.sh
@@ -20,6 +20,7 @@
 set -e -o pipefail
 
 BENCHMARK_BRANCH='develop'
+BRANCH='develop'
 
 TEMP=`getopt t:b::v::B::V::m::o::h "$@"`
 eval set -- "$TEMP"
diff --git a/infrastructure/scripts/aws/run_tests.sh b/infrastructure/scripts/aws/run_tests.sh
index 5035462..6565371 100755
--- a/infrastructure/scripts/aws/run_tests.sh
+++ b/infrastructure/scripts/aws/run_tests.sh
@@ -83,7 +83,19 @@ if [ ! -z "${BRANCH}" ]; then
 
   ssh ${SSH_OPTIONS} geode@$FIRST_INSTANCE "\
     rm -rf geode && \
-    git clone https://github.com/apache/geode --branch ${BRANCH} && \
+    git clone https://github.com/apache/geode --branch ${BRANCH}"
+
+  set +e
+  for i in {1..5}; do
+    if ssh ${SSH_OPTIONS} geode@$FIRST_INSTANCE "\
+      cd geode && \
+      ./gradlew resolveDependencies"; then
+      break
+    fi
+  done
+  set -e
+
+  ssh ${SSH_OPTIONS} geode@$FIRST_INSTANCE "\
     cd geode && \
     ./gradlew install installDist"