From: Thanh Ha <thanh.ha@linuxfoundation.org>
Date: Tue, 27 Nov 2018 08:14:56 +0000 (+0800)
Subject: Consolidate mvn-version as done in global-jjb
X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=commitdiff_plain;h=12ff010e3ceb6d3e36345da117999b0f15f2cafa;p=releng%2Fbuilder.git

Consolidate mvn-version as done in global-jjb

Follow global-jjb best practices.

Change-Id: I403443f23c241e1e86bd25cc219d11777d688b00
Signed-off-by: Thanh Ha <thanh.ha@linuxfoundation.org>
---

diff --git a/jjb/autorelease/autorelease-templates.yaml b/jjb/autorelease/autorelease-templates.yaml
index cb9ae1b1c..151e3a3c7 100644
--- a/jjb/autorelease/autorelease-templates.yaml
+++ b/jjb/autorelease/autorelease-templates.yaml
@@ -362,6 +362,7 @@
 
     mvn-global-settings: global-settings
     mvn-settings: autorelease-settings
+    mvn-version: mvn35
 
     #####################
     # Job configuration #
@@ -402,7 +403,7 @@
               and artifacts are not pushed to Nexus. Instead the build will be
               performed using the goals "clean install".
       - maven-exec:
-          maven-version: mvn35
+          maven-version: '{mvn-version}'
 
     scm:
       - lf-infra-gerrit-scm:
@@ -423,7 +424,7 @@
       - lf-infra-pre-build
       # force jenkins install of maven version before any shell scripts use it
       - lf-maven-install:
-          mvn-version: mvn35
+          mvn-version: '{mvn-version}'
       - lf-provide-maven-settings:
           global-settings-file: '{mvn-global-settings}'
           settings-file: '{mvn-settings}'
@@ -501,13 +502,14 @@
 - job-template:
     name: '{project-name}-validate-autorelease-{stream}'
 
-    ############
-    # Defaults #
-    ############
+    #####################
+    # Default variables #
+    #####################
 
     java-version: openjdk8
     mvn-global-settings: global-settings
     mvn-settings: autorelease-settings
+    mvn-version: mvn35
 
     #####################
     # Job Configuration #
@@ -576,7 +578,7 @@
       # to enable building in a single maven reactor afterwards.
       - autorelease-fix-relative-paths
       - maven-target:
-          maven-version: mvn35
+          maven-version: '{mvn-version}'
           pom: validate-pom.xml
           goals: |
               clean install dependency:tree
@@ -590,7 +592,7 @@
           global-settings: '{mvn-global-settings}'
           global-settings-type: cfp
       - maven-target:
-          maven-version: mvn35
+          maven-version: '{mvn-version}'
           pom: pom.xml
           goals: |
               clean validate