[geode] branch support/1.12 updated: GEODE-7779: Concourse BumpXYZ does not include {prerelease} (#4684)

[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 930835f  GEODE-7779: Concourse BumpXYZ does not include {prerelease} (#4684)
930835f is described below

commit 930835fe85c27a1d7d3d4d4e6105803add3cef79
Author: Bala Kaza Venkata <43...@users.noreply.github.com>
AuthorDate: Fri Apr 10 02:30:40 2020 -0400

    GEODE-7779: Concourse BumpXYZ does not include {prerelease} (#4684)
    
    Update the bump jobs to increment and add the semver release token which
    clears the wrong semver picking happening in past few days.
    
    Signed-off-by: Robert Houghton <rh...@pivotal.io>
    Signed-off-by: Bala Kaza Venkata <bk...@pivotal.io>
---
 ci/pipelines/geode-build/jinja.template.yml | 6 ++++--
 ci/pipelines/shared/jinja.variables.yml     | 2 +-
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/ci/pipelines/geode-build/jinja.template.yml b/ci/pipelines/geode-build/jinja.template.yml
index bf40295..a89eeaa 100644
--- a/ci/pipelines/geode-build/jinja.template.yml
+++ b/ci/pipelines/geode-build/jinja.template.yml
@@ -194,7 +194,7 @@ resources:
     driver: gcs
     initial_version: {{ metadata.initial_version }}
     json_key: ((!concourse-gcp-key))
-    key: semvers/((pipeline-prefix))((geode-build-branch))/version
+    key: semvers/((pipeline-prefix))((geode-build-branch))/number
 - name: geode-passing-tokens
   type: gcs-resource
   source:
@@ -246,7 +246,9 @@ jobs:
   serial: true
   plan:
   - get: geode-build-version
-    params: { bump: {{ semverPiece }} }
+    params: { bump: {{ semverPiece }},
+              pre: ((semver-prerelease-token)),
+              pre_without_version: true }
   - put: geode-build-version
     params:
       file: geode-build-version/number
diff --git a/ci/pipelines/shared/jinja.variables.yml b/ci/pipelines/shared/jinja.variables.yml
index c2987ec..c5c130f 100644
--- a/ci/pipelines/shared/jinja.variables.yml
+++ b/ci/pipelines/shared/jinja.variables.yml
@@ -66,7 +66,7 @@ java_test_versions:
   version: 11
 
 metadata:
-  initial_version: 1.12.1-SNAPSHOT
+  initial_version: 1.12.1-((semver-prerelease-token))
 
 publish_artifacts:
   CPUS: '8'