You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@geode.apache.org by sm...@apache.org on 2019/01/17 17:33:31 UTC
[geode] branch develop updated: GEODE-6276: Use named cli option in
benchmark (#3085)
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.git
The following commit(s) were added to refs/heads/develop by this push:
new d4da870 GEODE-6276: Use named cli option in benchmark (#3085)
d4da870 is described below
commit d4da870c3a7fc51db95f80b977b892536f0fe22a
Author: Helena Bales <hb...@pivotal.io>
AuthorDate: Thu Jan 17 09:33:16 2019 -0800
GEODE-6276: Use named cli option in benchmark (#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 <hb...@pivotal.io>
---
ci/pipelines/geode-build/jinja.template.yml | 2 ++
ci/pipelines/shared/jinja.variables.yml | 2 +-
ci/scripts/cleanup_benchmarks.sh | 2 +-
ci/scripts/run_benchmarks.sh | 9 ++++++++-
4 files changed, 12 insertions(+), 3 deletions(-)
diff --git a/ci/pipelines/geode-build/jinja.template.yml b/ci/pipelines/geode-build/jinja.template.yml
index efd9a5c..6ba70af 100644
--- 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
index 9b89dbd..3d3162f 100644
--- 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
index df5e047..1e8859c 100755
--- 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
index d1ea5c8..f3cc76d 100755
--- 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