Fix release-java and publish-p2repo cfp configs

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

diff --git a/jjb/releng-templates.yaml b/jjb/releng-templates.yaml
index 643ee3ff5cef1acc668f9d9615c84173a33577f9..89d8ec83bda8b46236b341ab742bb7dfb40830ab 100644 (file)
--- a/jjb/releng-templates.yaml
+++ b/jjb/releng-templates.yaml
@@ -48,7 +48,9 @@
         goals: 'clean deploy -V -B -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r -Djenkins -DaltDeploymentRepository=staging::default::file:hide/from/pom/files/stage'
         maven-opts: '-Xmx1024m -XX:MaxPermSize=256m'
         settings: 'autorelease-settings'
+        settings-type: cfp
         global-settings: 'odl-global-settings'
+        global-settings-type: cfp
         post-step-run-condition: UNSTABLE
 
     postbuilders:
@@ -87,7 +89,7 @@
         - jacoco-nojava-workaround
         - releng-fetch-p2zip-if-necessary:
             maven-version: '{mvn33}'
-            settings: '{project-settings}'
+            settings: '{mvn-settings}'
             global-settings: 'odl-global-settings'
         - releng-generate-p2pom
 
@@ -95,14 +97,14 @@
         maven-name: '{mvn33}'
         root-pom: 'pom.xml'
         goals: 'clean deploy -V -B -Dmaven.repo.local=/tmp/r'
-        settings: '{project-settings}'
+        settings: '{mvn-settings}'
         global-settings: 'odl-global-settings'
         post-step-run-condition: UNSTABLE
 
     postbuilders:
         - releng-update-p2composite-metadata:
             maven-version: '{mvn33}'
-            settings: '{project-settings}'
+            settings: '{mvn-settings}'
             global-settings: 'odl-global-settings'
 
     publishers:

diff --git a/jjb/yangide/yangide-releng.yaml b/jjb/yangide/yangide-releng.yaml
index 8ff99afac56fa66a974a2577e57a787df9eb36fe..be66dd9f4305f1ff7ff622d9173d0135da32310e 100644 (file)
--- a/jjb/yangide/yangide-releng.yaml
+++ b/jjb/yangide/yangide-releng.yaml
@@ -8,4 +8,4 @@
     project-name: 'yangide'
     jdk: 'openjdk8'
     stage-id: 'fba306956f98'
-    project-settings: 'org.jenkinsci.plugins.configfiles.maven.MavenSettingsConfig1448465159080'
+    mvn-settings: 'yangide-settings'