You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@geode.apache.org by on...@apache.org on 2019/08/07 07:23:28 UTC

[geode] branch release/1.10.0 updated: GEODE-7014: Move Benchmark to CI Main (#3891)

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

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


The following commit(s) were added to refs/heads/release/1.10.0 by this push:
     new 50e4ae2  GEODE-7014: Move Benchmark to CI Main (#3891)
50e4ae2 is described below

commit 50e4ae267d786bf274027cff40747924f3b661a9
Author: Helena Bales <hb...@pivotal.io>
AuthorDate: Wed Aug 7 00:23:01 2019 -0700

    GEODE-7014: Move Benchmark to CI Main (#3891)
    
    * Move benchmark to main group
    * Make it gating
    * Pass geode-ci resource between jobs
    
    Signed-off-by: Robert Houghton <rh...@pivotal.io>
---
 ci/pipelines/geode-build/jinja.template.yml | 27 ++++++++++++++-------------
 1 file changed, 14 insertions(+), 13 deletions(-)

diff --git a/ci/pipelines/geode-build/jinja.template.yml b/ci/pipelines/geode-build/jinja.template.yml
index 4a31704..0642c4a 100644
--- a/ci/pipelines/geode-build/jinja.template.yml
+++ b/ci/pipelines/geode-build/jinja.template.yml
@@ -24,6 +24,8 @@
 
 {% macro plan_resource_gets(test) %}
 - get: geode-ci
+  passed:
+  - Build
 - aggregate:
   - get: geode
     trigger: true
@@ -83,17 +85,11 @@ GRADLE_GLOBAL_ARGS: ((gradle-global-args))
 {%- endmacro %}
 
 {% macro all_gating_jobs() %}
-{%- for test in (tests) if not test.name=="StressNew" -%}
+  {%- for test in (tests) if not test.name=="StressNew" -%}
   {%- for java_test_version in (java_test_versions) %}
 - {{test.name}}Test{{java_test_version.name}}
   {%- endfor -%}
-{%- endfor -%}
-{% endmacro %}
-
-{% macro all_gating_jobs_for_benchmark() %}
-{%- for test in (tests) if not test.name=="StressNew" and test.PLATFORM=="linux"%}
-- {{test.name}}TestOpenJDK8
-{%- endfor -%}
+  {%- endfor -%}
 {% endmacro %}
 
 groups:
@@ -105,6 +101,7 @@ groups:
   {%- if repository.upstream_fork != "apache" or repository.branch == "develop" %}
   - PublishArtifacts
   {%- endif %}
+  - Benchmark
 - name: complete
   jobs:
   - {{ build_test.name }}
@@ -355,7 +352,7 @@ jobs:
 {%- if repository.upstream_fork != "apache" or repository.branch == "develop" %}
       - PublishArtifacts
 {% else %}
-      {{ all_gating_jobs() | indent(6) }}
+      - Benchmark
 {% endif %}
       trigger: true
     - get: geode-build-version
@@ -402,15 +399,17 @@ jobs:
   public: true
   plan:
   - get: geode-ci
+    passed:
+    {{ all_gating_jobs() | indent(4) }}
   - aggregate:
     - get: geode
       passed:
-      {{ all_gating_jobs_for_benchmark() | indent(6) }}
+      {{ all_gating_jobs() | indent(6) }}
       trigger: true
     - get: geode-benchmarks
     - get: geode-build-version
       passed:
-      {{ all_gating_jobs_for_benchmark() | indent(6) }}
+      {{ all_gating_jobs() | indent(6) }}
     - put: concourse-metadata-resource
   - task: run_benchmarks
     {{- alpine_tools_config()|indent(4) }}
@@ -458,14 +457,16 @@ jobs:
   public: true
   plan:
   - get: geode-ci
+    passed:
+    - Benchmark
   - aggregate:
     - get: geode
       passed:
-      {{ all_gating_jobs() | indent(6) }}
+      - Benchmark
       trigger: true
     - get: geode-build-version
       passed:
-      {{ all_gating_jobs() | indent(6) }}
+      - Benchmark
     - do:
       - put: concourse-metadata-resource
       {{ init_retry()|indent(6) }}