You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@geode.apache.org by rh...@apache.org on 2019/01/29 22:47:32 UTC

[geode] branch develop updated: GEODE-6314 Only rolling build-version semver at build time (#3113)

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

rhoughton 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 5a20ec0  GEODE-6314 Only rolling build-version semver at build time (#3113)
5a20ec0 is described below

commit 5a20ec02fc9197fe347859e515439aea6483f9f2
Author: Robert Houghton <rh...@pivotal.io>
AuthorDate: Tue Jan 29 14:47:22 2019 -0800

    GEODE-6314 Only rolling build-version semver at build time (#3113)
    
    * GEODE-6314 Only rolling build-version semver at build time
    
    * Upload new verison immediately
    * Use consistent 'pre' for the version id
    * Fix the 'get' for Windows, Publish, Benchmark jobs
    
    Co-authored-by: Patrick Rhomberg <pr...@pivotal.io>
    Co-authored-by: Robert Houghton <rh...@pivotal.io>
    
    * fix tabature for concourse happiness
    
    Co-authored-by: Patrick Rhomberg <pr...@pivotal.io>
    Co-authored-by: Robert Houghton <rh...@pivotal.io>
---
 ci/pipelines/geode-build/jinja.template.yml | 40 +++++++++++++++++------------
 1 file changed, 23 insertions(+), 17 deletions(-)

diff --git a/ci/pipelines/geode-build/jinja.template.yml b/ci/pipelines/geode-build/jinja.template.yml
index 791757b..f8a78f4 100644
--- a/ci/pipelines/geode-build/jinja.template.yml
+++ b/ci/pipelines/geode-build/jinja.template.yml
@@ -25,15 +25,20 @@
 - get: geode-ci
 - aggregate:
   - get: geode
+    trigger: true
     passed:
-    - Build
     {%- if test.name.startswith("Windows") %}
     {{- all_gating_jobs() | indent(4) -}}
+    {% else %}
+    - Build
     {%- endif %}
   - get: geode-build-version
     passed:
+    {%- if test.name.startswith("Windows") %}
+    {{- all_gating_jobs() | indent(4) -}}
+    {% else %}
     - Build
-    trigger: true
+    {%- endif %}
 {% endmacro %}
 
 {%- macro deep_merge(a, b): %}
@@ -216,14 +221,18 @@ jobs:
           - name: instance-data
         timeout: 15m
         attempts: 10
-  - task: rsync_code_up
-    {{- alpine_tools_config()|indent(4) }}
-      run:
-        path: geode-ci/ci/scripts/rsync_code_up.sh
-      inputs:
-      - name: geode-ci
-      - name: geode
-      - name: instance-data
+  - aggregate:
+    - put: geode-build-version
+      params:
+        file: geode-build-version/number
+    - task: rsync_code_up
+      {{- alpine_tools_config()|indent(6) }}
+        run:
+          path: geode-ci/ci/scripts/rsync_code_up.sh
+        inputs:
+        - name: geode-ci
+        - name: geode
+        - name: instance-data
     timeout: 5m
     on_failure:
       do:
@@ -265,9 +274,6 @@ jobs:
           outputs:
           - name: geode-results
         timeout: 5m
-      - put: geode-build-version
-        params:
-          file: geode-build-version/number
       ensure:
         do:
         - aggregate:
@@ -332,8 +338,8 @@ jobs:
       trigger: true
     - get: geode-benchmarks
     - get: geode-build-version
-      params:
-        pre: build
+      passed:
+      {{ all_gating_jobs() | indent(6) }}
     - put: concourse-metadata-resource
   - task: run_benchmarks
     {{- alpine_tools_config()|indent(4) }}
@@ -386,8 +392,8 @@ jobs:
       {{ all_gating_jobs() | indent(6) }}
       trigger: true
     - get: geode-build-version
-      params:
-        pre: ((semver-prerelease-token))
+      passed:
+      {{ all_gating_jobs() | indent(6) }}
     - do:
       - put: concourse-metadata-resource
       - task: create_instance