Switch to using global-jjb mvn macros

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

diff --git a/jjb/autorelease/autorelease-templates.yaml b/jjb/autorelease/autorelease-templates.yaml
index 7cdc433707b82611fb20d98a59cf7e7358c7e74b..135681dc193dfc676dc64897c3826d81a811b1d8 100644 (file)
--- a/jjb/autorelease/autorelease-templates.yaml
+++ b/jjb/autorelease/autorelease-templates.yaml
@@ -9,6 +9,7 @@
     cron: 'H 0 * * *'
 
     # Default variable values
+    mvn-version: mvn33
     extra-mvn-opts: ''
 
     properties:
@@ -16,12 +17,15 @@
           build-days-to-keep: 30
 
     parameters:
-      - maven-exec:
-          maven-version: 'mvn33'
       - lf-infra-parameters:
           project: '{project}'
           stream: '{stream}'
           branch: '{branch}'
+      - lf-infra-maven-parameters:
+          mvn-version: '{mvn-version}'
+          mvn-params:
+          mvn-opts:
+          staging-profile-id:
       - distribution-karaf-version:
           karaf-version: '{karaf-version}'
       - autorelease-release-tag:
@@ -64,13 +68,8 @@
 
     builders:
       # force jenkins install of maven version before any shell scripts use it
-      - maven-target:
-          maven-version: 'mvn33'
-          goals: '-version'
-          settings: 'autorelease-settings'
-          settings-type: cfp
-          global-settings: 'global-settings'
-          global-settings-type: cfp
+      - lf-maven-install:
+          mvn-version: '{mvn-version}'
       - wipe-local-maven-repo
       - jacoco-nojava-workaround
       - shell: "./scripts/list-project-dependencies.sh"