Simplify cfp jjb configuration

JJB 1.5.0 now allows CFP to use freeform IDs so lets use it to simplify
the yaml configuration.

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

diff --git a/jjb/global-defaults.yaml b/jjb/global-defaults.yaml
index d773641..bf14ab5 100644 (file)
--- a/jjb/global-defaults.yaml
+++ b/jjb/global-defaults.yaml
@@ -12,8 +12,3 @@
 
     # Maven versions
     mvn33: 'Maven_3.3.9'
-
-    # Config File provider ID mapping
-    global-settings: 'org.jenkinsci.plugins.configfiles.maven.GlobalMavenSettingsConfig1449593564219'
-    honeycomb-settings: 'org.jenkinsci.plugins.configfiles.maven.MavenSettingsConfig1452706188439972818'
-    vpp-settings: 'org.jenkinsci.plugins.configfiles.maven.MavenSettingsConfig1449593875850'

diff --git a/jjb/honeycomb/honeycomb.yaml b/jjb/honeycomb/honeycomb.yaml
index ecb12b2..965c6fe 100644 (file)
--- a/jjb/honeycomb/honeycomb.yaml
+++ b/jjb/honeycomb/honeycomb.yaml
@@ -54,8 +54,10 @@
         root-pom: 'pom.xml'
         goals: 'clean install -V -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r  -Dmerge -Dkaraf.keep.unpack=true'
         maven-opts: '-Xmx2048m -XX:MaxPermSize=256m -Dmaven.compile.fork=true'
-        settings: '{honeycomb-settings}'
-        global-settings: '{global-settings}'
+        settings: 'honeycomb-settings'
+        settings-type: cfp
+        global-settings: 'global-settings'
+        global-settings-type: cfp
 
     postbuilders:
         - shell: |
@@ -123,8 +125,10 @@
         root-pom: 'pom.xml'
         goals: 'clean install -V -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r  -Dmerge -Dkaraf.keep.unpack=true'
         maven-opts: '-Xmx2048m -XX:MaxPermSize=256m -Dmaven.compile.fork=true'
-        settings: '{honeycomb-settings}'
-        global-settings: '{global-settings}'
+        settings: 'honeycomb-settings'
+        settings-type: cfp
+        global-settings: 'global-settings'
+        global-settings-type: cfp
 
     postbuilders:
         - shell: |
@@ -178,8 +182,10 @@
         root-pom: 'pom.xml'
         goals: 'clean install -V -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r  -Dmerge -Dkaraf.keep.unpack=true'
         maven-opts: '-Xmx2048m -XX:MaxPermSize=256m -Dmaven.compile.fork=true'
-        settings: '{honeycomb-settings}'
-        global-settings: '{global-settings}'
+        settings: 'honeycomb-settings'
+        settings-type: cfp
+        global-settings: 'global-settings'
+        global-settings-type: cfp
 
     postbuilders:
         - shell: |
@@ -240,8 +246,10 @@
         root-pom: 'pom.xml'
         goals: 'clean install -V -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r  -Dmerge -Dkaraf.keep.unpack=true'
         maven-opts: '-Xmx2048m -XX:MaxPermSize=256m -Dmaven.compile.fork=true'
-        settings: '{honeycomb-settings}'
-        global-settings: '{global-settings}'
+        settings: 'honeycomb-settings'
+        settings-type: cfp
+        global-settings: 'global-settings'
+        global-settings-type: cfp
 
     postbuilders:
         - shell: |

diff --git a/jjb/vpp/vpp.yaml b/jjb/vpp/vpp.yaml
index aba5a8a..fafd916 100644 (file)
--- a/jjb/vpp/vpp.yaml
+++ b/jjb/vpp/vpp.yaml
@@ -190,11 +190,13 @@
         - maven-target:
             maven-version: '{mvn33}'
             goals: '--version'
-            settings: '{vpp-settings}'
-            global-settings: '{global-settings}'
+            settings: 'vpp-settings'
+            settings-type: cfp
+            global-settings: 'global-settings'
+            global-settings-type: cfp
         - provide-maven-settings:
-            settings-file: '{vpp-settings}'
-            global-settings-file: '{global-settings}'
+            settings-file: 'vpp-settings'
+            global-settings-file: 'global-settings'
         - shell:
             !include-raw-escape: include-raw-vpp-maven-push.sh