GEODE-6276: Use named cli option in benchmark (apache#3085)

The Benchmark scripts now take named cli options instead of positional ones. Use the named options in CI to call the benchmark, and pass the branch and version number through to the scripts, even though only one will be used at a time. Signed-off-by: Helena A. Bales <[email protected]>
kekerzzZ · Jan 17, 2019 · d4da870 · d4da870
1 parent 4f300f9
commit d4da870
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 3 deletions.
diff --git a/ci/pipelines/geode-build/jinja.template.yml b/ci/pipelines/geode-build/jinja.template.yml
@@ -344,6 +344,7 @@ jobs:
         AWS_REGION: us-west-2
         ARTIFACT_BUCKET: ((artifact-bucket))
         BASELINE_BRANCH: {{benchmarks.baseline_branch}}
+        BASELINE_VERSION: {{benchmarks.baseline_version}}
       run:
         path: geode-ci/ci/scripts/run_benchmarks.sh
       inputs:
@@ -365,6 +366,7 @@ jobs:
             AWS_REGION: us-west-2
             ARTIFACT_BUCKET: ((artifact-bucket))
             BASELINE_BRANCH: {{benchmarks.baseline_branch}}
+            BASELINE_VERSION: {{benchmarks.baseline_version}}
           run:
             path: geode-ci/ci/scripts/cleanup_benchmarks.sh
           inputs:

diff --git a/ci/pipelines/shared/jinja.variables.yml b/ci/pipelines/shared/jinja.variables.yml
@@ -57,7 +57,7 @@ java_test_versions:
   version: 11
 
 benchmarks:
-  baseline_branch: "rel/v1.8.0"
+  baseline_version: "1.8.0"
 
 java_build_version:
   name: OpenJDK8

diff --git a/ci/scripts/cleanup_benchmarks.sh b/ci/scripts/cleanup_benchmarks.sh
@@ -62,7 +62,7 @@ pushd ${RESULTS_BASE_DIR}
     gsutil cp ${BENCHMARKS_ARCHIVE_FILE} gs://${BENCHMARKS_ARTIFACTS_DESTINATION}/${BENCHMARKS_ARCHIVE_FILENAME}
     printf "\n"
     printf "\033[92m=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=\033[0m\n"
-    printf "\033[92mThis benchmark run is the result of comparing ${GEODE_SHA} with baseline ${BASELINE_BRANCH}\033[0m\n"
+    printf "\033[92mThis benchmark run is the result of comparing ${GEODE_SHA} with baseline ${BASELINE_BRANCH:-${BASELINE_VERSION}}\033[0m\n"
     printf "\033[92m=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=- Commit Message =-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=\033[0m\n"
     echo "${GEODE_SHA_COMMIT_MESSAGE}"
     printf "\033[92m=-=-=-=-=-=-=-=-=-=-=-=-=-=-= Benchmark Results URI =-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=\033[0m\n"

diff --git a/ci/scripts/run_benchmarks.sh b/ci/scripts/run_benchmarks.sh
@@ -42,6 +42,13 @@ popd
 
 pushd geode-benchmarks/infrastructure/scripts/aws/
 ./launch_cluster.sh ${CLUSTER_TAG} ${CLUSTER_COUNT}
-./run_against_baseline.sh ${CLUSTER_TAG} ${GEODE_SHA} ${BASELINE_BRANCH} ${BENCHMARKS_BRANCH} ${RESULTS_DIR}
+
+if [ -z "${BASELINE_VERSION}" ]; then
+  ./run_against_baseline.sh -t ${CLUSTER_TAG} -b ${GEODE_SHA} -B ${BASELINE_BRANCH} -m ${BENCHMARKS_BRANCH} -o ${RESULTS_DIR}
+else
+  ./run_against_baseline.sh -t ${CLUSTER_TAG} -b ${GEODE_SHA} -V ${BASELINE_VERSION} -m ${BENCHMARKS_BRANCH} -o ${RESULTS_DIR}
+fi
+
+
 
 popd