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 cf1dd72 Fixes install of geode artifacts. cf1dd72 is described below commit cf1dd728fdd096479be25a943c8f0d34fed28238 Author: Jacob Barrett <jbarr...@pivotal.io> AuthorDate: Thu Apr 18 14:38:00 2019 -0700 Fixes install of geode artifacts. Uses publishToMavenLocal when available or install on older builds. Updates existing repo rather than deleting it. --- infrastructure/scripts/aws/run_tests.sh | 23 +++++++++++++++-------- 1 file changed, 15 insertions(+), 8 deletions(-) diff --git a/infrastructure/scripts/aws/run_tests.sh b/infrastructure/scripts/aws/run_tests.sh index 93d130e..f646ce4 100755 --- a/infrastructure/scripts/aws/run_tests.sh +++ b/infrastructure/scripts/aws/run_tests.sh @@ -156,9 +156,8 @@ if [[ -z "${VERSION}" ]]; then fi ssh ${SSH_OPTIONS} geode@$FIRST_INSTANCE "\ - rm -rf geode && \ - git clone ${REPO} && \ - cd geode && git checkout ${BRANCH}" + [ ! -d geode ] && git clone ${REPO}; \ + cd geode && git fetch --all && git checkout ${BRANCH} && git pull" set +e for i in {1..5}; do @@ -170,9 +169,18 @@ if [[ -z "${VERSION}" ]]; then done set -e + if ssh ${SSH_OPTIONS} geode@$FIRST_INSTANCE "\ + cd geode && \ + ./gradlew tasks --console plain | egrep '\publishToMavenLocal\b'"; then + install_target="publishToMavenLocal" + else + # install target is legacy but required for older releases + install_target="install" + fi + ssh ${SSH_OPTIONS} geode@$FIRST_INSTANCE "\ cd geode && \ - ./gradlew install installDist" + ./gradlew ${install_target} installDist" VERSION=$(ssh ${SSH_OPTIONS} geode@$FIRST_INSTANCE geode/geode-assembly/build/install/apache-geode/bin/gfsh version) fi @@ -191,10 +199,9 @@ set -e instance_id=$(ssh ${SSH_OPTIONS} geode@$FIRST_INSTANCE cat .geode-benchmarks-identifier) -ssh ${SSH_OPTIONS} geode@${FIRST_INSTANCE} \ - rm -rf geode-benchmarks '&&' \ - git clone ${BENCHMARK_REPO} '&&' \ - cd geode-benchmarks '&&' git checkout ${BENCHMARK_BRANCH} +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" BENCHMARK_SHA=$(ssh ${SSH_OPTIONS} geode@${FIRST_INSTANCE} \ cd geode-benchmarks '&&' \