From f0d5fef41ecb5f9d4eaf8bb710c1e584c733cc6e Mon Sep 17 00:00:00 2001
From: ckonstanski <ckonstanski@pippiandcarlos.com>
Date: Tue, 17 Oct 2017 10:37:30 -0600
Subject: git tagging

---
 jjb/yaml/openbook-pipeline.yaml | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

(limited to 'jjb/yaml')

diff --git a/jjb/yaml/openbook-pipeline.yaml b/jjb/yaml/openbook-pipeline.yaml
index 75cf363..52536b0 100644
--- a/jjb/yaml/openbook-pipeline.yaml
+++ b/jjb/yaml/openbook-pipeline.yaml
@@ -22,6 +22,9 @@
                 customWorkspace "workspace/{artifact}"
               }}
           }}
+          environment {{
+              NEW_TAG = "4.1.1"
+          }}
           stages {{
               stage("gradle") {{
                   steps {{
@@ -36,7 +39,8 @@
                               ]
                           ]
                       )
-                      sh(script: "gradle -PbuildNumber=4.1.${{BUILD_NUMBER}} -PbuildMode=buildProd -Dorg.gradle.daemon=false clean shadowJar")
+                      sh(script: "NEW_TAG=\$(/var/lib/jenkins/find_next_tag.sh \$(pwd) 4.1)")
+                      sh(script: "gradle -PbuildNumber=${{NEW_TAG}} -PbuildMode=buildProd -Dorg.gradle.daemon=false clean shadowJar")
                       stash(includes: "build/libs/*.jar", name: "jar")
                   }}
               }}
@@ -57,7 +61,7 @@
                           ]
                       )
                       unstash(name: "jar")
-                      sh(script: "ruby openbook/ruby/upload_jar.rb --webdav-url=${{WEBDAV_URL}} --webdav-username=${{WEBDAV_USERNAME}} --webdav-password=${{WEBDAV_PASSWORD}} --artifact={artifact} --version=4.1.${{BUILD_NUMBER}} --filepath=build/libs/{artifact}.4.1.${{BUILD_NUMBER}}.jar")
+                      sh(script: "ruby openbook/ruby/upload_jar.rb --webdav-url=${{WEBDAV_URL}} --webdav-username=${{WEBDAV_USERNAME}} --webdav-password=${{WEBDAV_PASSWORD}} --artifact={artifact} --version=${{NEW_TAG}} --filepath=build/libs/{artifact}.${{NEW_TAG}}.jar")
                   }}
               }}
               stage("docker-container") {{
-- 
cgit v1.3