[geode] branch release/1.9.0 updated: Use branch of benchmarks targeted for release/1.9.0.

[jb...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

jbarrett pushed a commit to branch release/1.9.0
in repository https://gitbox.apache.org/repos/asf/geode.git


The following commit(s) were added to refs/heads/release/1.9.0 by this push:
     new 8e92509  Use branch of benchmarks targeted for release/1.9.0.
8e92509 is described below

commit 8e9250965ad16ce80f7f50eefbe005c2b559e284
Author: Jacob Barrett <jb...@pivotal.io>
AuthorDate: Fri Apr 19 10:34:43 2019 -0700

    Use branch of benchmarks targeted for release/1.9.0.
---
 ci/pipelines/geode-build/jinja.template.yml | 3 ++-
 ci/pipelines/shared/jinja.variables.yml     | 1 +
 ci/scripts/run_benchmarks.sh                | 1 -
 3 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/ci/pipelines/geode-build/jinja.template.yml b/ci/pipelines/geode-build/jinja.template.yml
index cf9e426..b9db2d1 100644
--- a/ci/pipelines/geode-build/jinja.template.yml
+++ b/ci/pipelines/geode-build/jinja.template.yml
@@ -176,7 +176,7 @@ resources:
 - name: geode-benchmarks
   type: git
   source:
-    branch: develop
+    branch: {{benchmarks.branch}}
     depth: 1
     uri: https://github.com/apache/geode-benchmarks.git
 - name: geode-build-version
@@ -374,6 +374,7 @@ jobs:
         AWS_DEFAULT_REGION: us-west-2
         AWS_REGION: us-west-2
         ARTIFACT_BUCKET: ((artifact-bucket))
+        BENCHMARK_BRANCH: {{benchmarks.branch}}
         BASELINE_BRANCH: {{benchmarks.baseline_branch}}
         BASELINE_VERSION: {{benchmarks.baseline_version}}
       run:
diff --git a/ci/pipelines/shared/jinja.variables.yml b/ci/pipelines/shared/jinja.variables.yml
index a3edf9f..3a00e4e 100644
--- a/ci/pipelines/shared/jinja.variables.yml
+++ b/ci/pipelines/shared/jinja.variables.yml
@@ -57,6 +57,7 @@ java_test_versions:
   version: 11
 
 benchmarks:
+  branch: "release/1.9.0"
   baseline_branch: ""
   baseline_version: "1.8.0"
 
diff --git a/ci/scripts/run_benchmarks.sh b/ci/scripts/run_benchmarks.sh
index 7c8c0dc..3c85d59 100755
--- a/ci/scripts/run_benchmarks.sh
+++ b/ci/scripts/run_benchmarks.sh
@@ -34,7 +34,6 @@ CLUSTER_TAG="${BUILD_PIPELINE_NAME}-${BUILD_JOB_NAME}-${BUILD_NAME}-${BUILD_ID}"
 RESULTS_DIR=$(pwd)/results/benchmarks-${CLUSTER_TAG}
 
 CLUSTER_COUNT=4
-BENCHMARKS_BRANCH=develop
 
 pushd geode
 GEODE_SHA=$(git rev-parse --verify HEAD)