Fix distribution-verify job back to freestyle

The big patch https://git.opendaylight.org/gerrit/53797 accidently
converted the distribution-verify job back to a Maven project type and
causes builder-jjb-merge to fail because it is not able to update a job
that's of a different type.

Since we don't want to be reverting jobs back to Maven project types
anyway this patch updates the job to use freestyle again.

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

diff --git a/jjb/integration/distribution/distribution-jobs.yaml b/jjb/integration/distribution/distribution-jobs.yaml
index 4790f14be983d33131f09f47c8b5b7eef3e98cf3..d7a3b7e0d1fc30fe2d5803df7a9eacd1e131a1ef 100644 (file)
--- a/jjb/integration/distribution/distribution-jobs.yaml
+++ b/jjb/integration/distribution/distribution-jobs.yaml
@@ -5,7 +5,7 @@
 - job-template:
     name: 'distribution-verify-{stream}'
 
-    project-type: maven
+    project-type: freestyle
     node: centos7-java-builder-2c-8g
     concurrent: true
     jdk: '{jre}'
@@ -40,31 +40,27 @@
           branch: '{branch}'
           files: '**'
 
-    prebuilders:
+    builders:
       - wipe-org-opendaylight-repo
       - provide-maven-settings:
           global-settings-file: 'odl-global-settings'
           settings-file: 'integration-settings'
-
-    maven:
-      maven-name: 'mvn33'
-      root-pom: 'pom.xml'
-      goals: >
-          clean install dependency:tree -DoutputFile=dependency_tree.txt -V -B
-          -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r
-          -Djenkins -Dstream={stream}
-      maven-opts: '-Xmx1024m -XX:MaxPermSize=256m'
-      settings: 'integration-settings'
-      settings-type: cfp
-      global-settings: 'odl-global-settings'
-      global-settings-type: cfp
-      ignore-upstream-changes: true
-      post-step-run-condition: 'SUCCESS'
-
-    reporters:
-      - findbugs
+      - maven-target:
+          maven-version: mvn33
+          pom: pom.xml
+          goals: |
+              clean install dependency:tree -DoutputFile=dependency_tree.txt
+              -Dstream={stream}
+              {opendaylight-infra-mvn-opts}
+          java-opts:
+            - '-Xmx1024m -XX:MaxPermSize=256m'
+          settings: integration-settings
+          settings-type: cfp
+          global-settings: odl-global-settings
+          global-settings-type: cfp
 
     publishers:
+      - findbugs
       - jacoco-report
       - opendaylight-infra-shiplogs:
           maven-version: 'mvn33'