Fix autorelease settings-type for Maven

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

diff --git a/jjb/autorelease/autorelease-macros.yaml b/jjb/autorelease/autorelease-macros.yaml
index da183a1012c587ce40fb9432f76e7e754596f494..8f7793eea205b4d5f6735901b0a421bd0441f7bf 100644 (file)
--- a/jjb/autorelease/autorelease-macros.yaml
+++ b/jjb/autorelease/autorelease-macros.yaml
@@ -115,7 +115,9 @@
             java-opts:
                 - '-Xmx4096m -XX:MaxPermSize=1024m'
             settings: '{settings}'
+            settings-type: cfp
             global-settings: '{global-settings}'
+            global-settings-type: cfp
 
 - builder:
     name: autorelease-maven-sources-post-process

diff --git a/jjb/autorelease/autorelease-templates.yaml b/jjb/autorelease/autorelease-templates.yaml
index a77a1fbbb4933bbe72a1b49efa6df1762d48ffbf..a901f463487f4bdcca7bc0528c33793c98e3b6a1 100644 (file)
--- a/jjb/autorelease/autorelease-templates.yaml
+++ b/jjb/autorelease/autorelease-templates.yaml
@@ -56,7 +56,9 @@
         goals: 'clean deploy -Pintegrationtests,docs,repoBuild -Djenkins -Dcheckstyle.skip=true -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r -DaltDeploymentRepository=staging::default::file:hide/from/pom/files/stage'
         maven-opts: '-Xmx10g -XX:MaxPermSize=1024m -Dmaven.compile.fork=true'
         settings: '{autorelease-settings}'
+        settings-type: cfp
         global-settings: '{odl-global-settings}'
+        global-settings-type: cfp
         automatic-archiving: true
         post-step-run-condition: UNSTABLE
 
@@ -200,7 +202,9 @@
         goals: 'site:site site:deploy -Dstream={stream}'
         maven-opts: '-Xmx1024m'
         settings: '{autorelease-settings}'
+        settings-type: cfp
         global-settings: '{odl-global-settings}'
+        global-settings-type: cfp
 
     publishers:
     - email-notification:
@@ -252,7 +256,9 @@
         goals: 'site:site -Dstream={stream}'
         maven-opts: '-Xmx1024m'
         settings: '{autorelease-settings}'
+        settings-type: cfp
         global-settings: '{odl-global-settings}'
+        global-settings-type: cfp
 
     publishers:
         - email-notification: