[logging-pipelines] branch master updated: Move version check to deploy stage

[mattsicker]

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

mattsicker pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/logging-pipelines.git


The following commit(s) were added to refs/heads/master by this push:
     new adf04a8  Move version check to deploy stage
adf04a8 is described below

commit adf04a83dbf10496dc12652c9d7d577aefd55163
Author: Matt Sicker <boa...@gmail.com>
AuthorDate: Sun Jun 6 14:47:04 2021 -0500

    Move version check to deploy stage
    
    This should hopefully guarantee availability of maven and jdk tools by
    this point. Otherwise, we'll need full paths as a workaround.
---
 chainsaw/Jenkinsfile | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/chainsaw/Jenkinsfile b/chainsaw/Jenkinsfile
index ca6c205..6778251 100644
--- a/chainsaw/Jenkinsfile
+++ b/chainsaw/Jenkinsfile
@@ -34,9 +34,6 @@ pipeline {
         jdk 'jdk_1.8_latest'
         maven 'maven_3_latest'
     }
-    environment {
-        PROJECT_VERSION = "${sh(returnStdout: true, script: 'mvn help:evaluate 
-Dexpression=project.version -q -DforceStdout')}"
-    }
     stages {
         stage('Build') {
             steps {
@@ -56,7 +53,7 @@ pipeline {
             when {
                 allOf {
                     branch 'master'
-                    expression { env.PROJECT_VERSION.endsWith('-SNAPSHOT') }
+                    expression { sh(returnStdout: true, script: 'mvn 
help:evaluate -Dexpression=project.version -q 
-DforceStdout').endsWith('-SNAPSHOT') }
                 }
             }
             steps {