commit 46b2653c605b487389399d6a6293cb59c32a0633
author Nabarun Nag <nabarunnag@users.noreply.github.com> Wed Dec 19 22:29:46 2018 -0800
committer GitHub <noreply@github.com> Wed Dec 19 22:29:46 2018 -0800
tree b0af795112396c6361fc2df425fd3ecebdc11b9c
parent f0a8721c129a3214be0f89b0fe4041435776c8a3

Using the dependencies from the local maven repo. (#30)

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

* Adding the output file to gitignore

.gitignore

diff --git a/.gitignore b/.gitignore
index 28ed289..59d0740 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,4 +2,4 @@
 out
 .gradle
 build/
-output/
\ No newline at end of file
+output*/

geode-benchmarks/build.gradle

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 @@
 
 
 repositories {
+    mavenLocal()
     mavenCentral()
 }
 

infrastructure/scripts/aws/run_against_baseline.sh

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}
 

infrastructure/scripts/aws/run_tests.sh

diff --git a/infrastructure/scripts/aws/run_tests.sh b/infrastructure/scripts/aws/run_tests.sh
index e5bb5c5..2295c80 100755
--- a/infrastructure/scripts/aws/run_tests.sh
+++ b/infrastructure/scripts/aws/run_tests.sh
@@ -20,8 +20,8 @@
 
 TAG=${1}
 BRANCH=${2:-develop}
-OUTPUT=${3:-output-${DATE}-${TAG}}
-BENCHMARK_BRANCH=${4:-develop}
+BENCHMARK_BRANCH=${3:-develop}
+OUTPUT=${4:-output-${DATE}-${TAG}}
 PREFIX="geode-performance-${TAG}"
 
 SSH_OPTIONS="-i ~/.ssh/geode-benchmarks/${TAG}.pem"
@@ -35,13 +35,17 @@
 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}
 
 scp ${SSH_OPTIONS} -r geode@${FIRST_INSTANCE}:geode-benchmarks/geode-benchmarks/build/reports ${OUTPUT}/reports
+BENCHMARK_DIRECTORY="$(ssh ${SSH_OPTIONS} geode@${FIRST_INSTANCE} ls -l geode-benchmarks/geode-benchmarks/build/ | grep benchmark | awk 'NF>1{print $NF}')"
+scp ${SSH_OPTIONS} -r geode@${FIRST_INSTANCE}:geode-benchmarks/geode-benchmarks/build/${BENCHMARK_DIRECTORY} ${OUTPUT}
 
-scp ${SSH_OPTIONS} -r geode@${FIRST_INSTANCE}:geode-benchmarks/geode-benchmarks/build/benchmarks ${OUTPUT}

infrastructure/scripts/google_cloud/run_against_baseline.sh

diff --git a/infrastructure/scripts/google_cloud/run_against_baseline.sh b/infrastructure/scripts/google_cloud/run_against_baseline.sh
index 63063cb..1bcb935 100755
--- a/infrastructure/scripts/google_cloud/run_against_baseline.sh
+++ b/infrastructure/scripts/google_cloud/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}
 

infrastructure/scripts/google_cloud/run_tests.sh

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