[geode] branch support/1.12 updated: GEODE-8347: use same benchmarks branch as geode branch, since that's the way we release (#5361)

[on...@apache.org]

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

onichols pushed a commit to branch support/1.12
in repository https://gitbox.apache.org/repos/asf/geode.git


The following commit(s) were added to refs/heads/support/1.12 by this push:
     new c7b82a5  GEODE-8347: use same benchmarks branch as geode branch, since that's the way we release (#5361)
c7b82a5 is described below

commit c7b82a538cc24c22d0b1fa4380676c2ba9ac5270
Author: Owen Nichols <34...@users.noreply.github.com>
AuthorDate: Thu Jul 9 14:57:12 2020 -0700

    GEODE-8347: use same benchmarks branch as geode branch, since that's the way we release (#5361)
    
    also balance max_in_flight according to how long each job takes
    
    (cherry picked from commit daa70d729b98f8edc3791a0dfccbf102ab94dd94)
    (cherry picked from commit ecd697625bb799d82dc41158d51baa73ede97bf8)
---
 ci/pipelines/geode-build/jinja.template.yml | 2 +-
 ci/pipelines/shared/jinja.variables.yml     | 5 ++++-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/ci/pipelines/geode-build/jinja.template.yml b/ci/pipelines/geode-build/jinja.template.yml
index 517cc4a..7adefcc 100644
--- a/ci/pipelines/geode-build/jinja.template.yml
+++ b/ci/pipelines/geode-build/jinja.template.yml
@@ -458,7 +458,7 @@ jobs:
 {% for run_var in (benchmarks.flavors) %}
 - name: Benchmark{{ run_var.title }}
   public: true
-  max_in_flight: 2
+  max_in_flight: {{ run_var.max_in_flight }}
   plan:
   - get: geode-ci
     passed: &benchmark-inputs
diff --git a/ci/pipelines/shared/jinja.variables.yml b/ci/pipelines/shared/jinja.variables.yml
index b9ce307..66a0edd 100644
--- a/ci/pipelines/shared/jinja.variables.yml
+++ b/ci/pipelines/shared/jinja.variables.yml
@@ -18,17 +18,20 @@
 benchmarks:
   baseline_branch: ''
   baseline_version: '1.12.0'
-  benchmark_branch: develop
+  benchmark_branch: ((geode-build-branch))
   flavors:
   - title: '_base'
     flag: ''
     options: ''
+    max_in_flight: 4
   - title: '_with_ssl'
     flag: '-PwithSsl -PtestJVM=/usr/lib/jvm/java-11-openjdk-amd64/'
     options: '--tests=*GetBenchmark --tests=*PutBenchmark'
+    max_in_flight: 1
   - title: '_with_security_manager'
     flag: '-PwithSecurityManager'
     options: '--tests=Partitioned*'
+    max_in_flight: 2
 
 build_test:
   ARTIFACT_SLUG: build