Migrate maven to freestyle for distribution-check

Change-Id: Id11ce6a55d39d88f3798247164e54256fe33d58f
Signed-off-by: Anil Belur <abelur@linuxfoundation.org>

diff --git a/jjb/releng-templates-java.yaml b/jjb/releng-templates-java.yaml
index f4bb10dad3da73ce03dfe5646cf0bae8d56bf703..4dc2120c6b5faf7ece33b6f28a13967d476c05d8 100644 (file)
--- a/jjb/releng-templates-java.yaml
+++ b/jjb/releng-templates-java.yaml
@@ -133,7 +133,7 @@
     name: '{project-name}-distribution-check-{stream}'
     disabled: '{obj:disable_distribution_check}'
 
-    project-type: maven
+    project-type: freestyle
     node: '{build-node}'
     concurrent: true
     jdk: '{jdk}'
@@ -191,7 +191,7 @@
                 unstable: false
                 notbuilt: false
 
-    prebuilders:
+    builders:
         - maven-target:
             maven-version: '{mvn33}'
             pom: '$GERRIT_PROJECT/pom.xml'
@@ -202,20 +202,16 @@
             settings-type: cfp
             global-settings: 'odl-global-settings'
             global-settings-type: cfp
-
-    maven:
-        maven-name: '{mvn33}'
-        root-pom: 'distribution/pom.xml'
-        goals: 'clean install dependency:tree -DoutputFile=dependency_tree.txt -V -B -Djenkins -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r'
-        maven-opts: '-Xmx1024m -XX:MaxPermSize=256m -Dmaven.compile.fork=true'
-        settings: '{mvn-settings}'
-        settings-type: cfp
-        global-settings: 'odl-global-settings'
-        global-settings-type: cfp
-        ignore-upstream-changes: true
-        post-step-run-condition: 'SUCCESS'
-
-    postbuilders:
+        - maven-target:
+            maven-version: '{mvn33}'
+            pom: 'distribution/pom.xml'
+            goals: 'clean install dependency:tree -DoutputFile=dependency_tree.txt -V -B -Djenkins -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r'
+            java-opts:
+              - '-Xmx1024m -XX:MaxPermSize=256m -Dmaven.compile.fork=true'
+            settings: '{mvn-settings}'
+            settings-type: cfp
+            global-settings: 'odl-global-settings'
+            global-settings-type: cfp
         - integration-distribution-check
 
     publishers: