[logging-pipelines] branch master updated: Fix job name comparison

[ma...@apache.org]

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 f748a7f  Fix job name comparison
f748a7f is described below

commit f748a7fc8cb232a7def2acda45468633d894d56b
Author: Matt Sicker <bo...@gmail.com>
AuthorDate: Sat May 8 15:11:10 2021 -0500

    Fix job name comparison
---
 vars/mvn.groovy | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/vars/mvn.groovy b/vars/mvn.groovy
index 4826bc4..14239ba 100644
--- a/vars/mvn.groovy
+++ b/vars/mvn.groovy
@@ -19,13 +19,13 @@ def call(String args) {
     String mavenHome = tool 'maven_3_latest'
     String javaVersion = '1.8'
     boolean useToolchains = false
-    if (env.JOB_NAME == 'Logging/log4j') {
+    if (env.JOB_NAME.startsWith 'Logging/log4j/') {
         if (env.BRANCH_NAME == 'release-2.x' || env.CHANGE_TARGET == 'release-2.x') {
             useToolchains = true
         } else if (env.BRANCH_NAME == 'master' || env.CHANGE_TARGET == 'master') {
             javaVersion = '11'
         }
-    } else if (env.JOB_NAME == 'Logging/chainsaw') {
+    } else if (env.JOB_NAME.startsWith 'Logging/chainsaw') {
         javaVersion = '9'
     }
     String javaHome = tool "jdk_${javaVersion}_latest"