This is an automated email from the ASF dual-hosted git repository. nnag pushed a commit to branch feature/localMavenFix in repository https://gitbox.apache.org/repos/asf/geode-benchmarks.git
commit faf1ded7242e86c276687ecef56f813371ed83af Author: nabarun <[email protected]> AuthorDate: Tue Dec 18 15:55:43 2018 -0800 Using the dependencies from the local maven repo. * First Apache Geode builds and publishes the dependencies to the local repo * geode-benchmark will pick up the dependencies from the local repo. --- geode-benchmarks/build.gradle | 1 + infrastructure/scripts/aws/run_against_baseline.sh | 2 +- infrastructure/scripts/aws/run_tests.sh | 5 ++++- infrastructure/scripts/google_cloud/run_tests.sh | 5 ++++- 4 files changed, 10 insertions(+), 3 deletions(-) diff --git a/geode-benchmarks/build.gradle b/geode-benchmarks/build.gradle index 1944e6b..0162e0d 100644 --- a/geode-benchmarks/build.gradle +++ b/geode-benchmarks/build.gradle @@ -33,6 +33,7 @@ def getDate() { repositories { + mavenLocal() mavenCentral() } diff --git a/infrastructure/scripts/aws/run_against_baseline.sh b/infrastructure/scripts/aws/run_against_baseline.sh index 63063cb..1bcb935 100755 --- a/infrastructure/scripts/aws/run_against_baseline.sh +++ b/infrastructure/scripts/aws/run_against_baseline.sh @@ -20,7 +20,7 @@ DATE=$(date '+%m-%d-%Y-%H-%M-%S') TAG=${1} BRANCH=${2:-develop} -BASELINE=${3:-"rel/v1.7.0"} +BASELINE=${3:-"rel/v1.8.0"} BENCHMARK_BRANCH=${4:-develop} OUTPUT=output-${DATE}-${TAG} diff --git a/infrastructure/scripts/aws/run_tests.sh b/infrastructure/scripts/aws/run_tests.sh index e5bb5c5..fa992bc 100755 --- a/infrastructure/scripts/aws/run_tests.sh +++ b/infrastructure/scripts/aws/run_tests.sh @@ -35,9 +35,12 @@ echo "HOSTS=${HOSTS}" ssh ${SSH_OPTIONS} geode@$FIRST_INSTANCE "\ rm -rf geode-benchmarks geode && \ git clone --depth=1 https://github.com/apache/geode --branch ${BRANCH} geode && \ + cd geode && \ + ./gradlew pTML -PversionNumber=${DATE} -PreleaseType="-BENCHMARKBUILD" && \ + cd .. && \ git clone https://github.com/apache/geode-benchmarks --branch ${BENCHMARK_BRANCH} && \ cd geode-benchmarks && \ - ./gradlew --include-build ../geode benchmark -Phosts=${HOSTS}" + ./gradlew -PgeodeVersion=${DATE}-BENCHMARKBUILD benchmark -Phosts=${HOSTS}" mkdir -p ${OUTPUT} diff --git a/infrastructure/scripts/google_cloud/run_tests.sh b/infrastructure/scripts/google_cloud/run_tests.sh index 477a75a..71a05e2 100755 --- a/infrastructure/scripts/google_cloud/run_tests.sh +++ b/infrastructure/scripts/google_cloud/run_tests.sh @@ -34,9 +34,12 @@ FIRST_INSTANCE=$(echo ${INSTANCES} | awk '{print $1}' ) gcloud compute ssh geode@$FIRST_INSTANCE --command="\ rm -rf geode-benchmarks geode && \ git clone --depth=1 https://github.com/apache/geode --branch ${BRANCH} geode && \ + cd geode && \ + ./gradlew pTML -PversionNumber=${DATE} -PreleaseType="-BENCHMARKBUILD" && \ + cd .. && \ git clone https://github.com/apache/geode-benchmarks --branch ${BENCHMARK_BRANCH} && \ cd geode-benchmarks && \ - ./gradlew --include-build ../geode benchmark -Phosts=${HOSTS}" + ./gradlew -PgeodeVersion=${DATE}-BENCHMARKBUILD benchmark -Phosts=${HOSTS}" mkdir -p ${OUTPUT}
