Migrate maven to freestyle for sonar

Change-Id: I810316417769df3c4f3f775aff3f3c151be76e3f
Co-Authored-By: Thanh Ha <thanh.ha@linuxfoundation.org>
Signed-off-by: Anil Belur <abelur@linuxfoundation.org>

diff --git a/jjb/netvirt/netvirt-sonar.yaml b/jjb/netvirt/netvirt-sonar.yaml
index 94775976253d15306c1c9fcd06a9f271dca2b0ba..4d1d7bb938abb11cffba6ff99a950b294db81377 100644 (file)
--- a/jjb/netvirt/netvirt-sonar.yaml
+++ b/jjb/netvirt/netvirt-sonar.yaml
@@ -19,7 +19,7 @@
 - job-template:
     name: 'netvirt-sonar'
 
-    project-type: maven
+    project-type: freestyle
     node: centos7-docker-2c-4g
     jdk: '{jdk}'
 
@@ -50,25 +50,23 @@
         - gerrit-trigger-patch-sonar:
             name: 'netvirt'
 
-    prebuilders:
+    builders:
         - shell:
             !include-raw-escape:
                 - include-setup-misc.sh
         - inject:
             properties-file: env.properties
         - install-docker-composeSonar
-
-    maven:
-        maven-name: '{mvn33}'
-        root-pom: 'pom.xml'
-        goals: 'clean install dependency:tree -V -B -Dsonar -Dskip.karaf.featureTest=true -Dmaven.compile.fork=true -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r'
-        maven-opts: '-Xmx1024m -XX:MaxPermSize=256m'
-        settings: 'netvirt-settings'
-        settings-type: cfp
-        global-settings: 'odl-global-settings'
-        global-settings-type: cfp
-
-    postbuilders:
+        - maven-target:
+            maven-version: '{mvn33}'
+            pom: 'pom.xml'
+            goals: 'clean install dependency:tree -V -B -Dsonar -Dskip.karaf.featureTest=true -Dmaven.compile.fork=true -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r'
+            java-opts:
+                - '-Xmx1024m -XX:MaxPermSize=256m'
+            settings: 'netvirt-settings'
+            settings-type: cfp
+            global-settings: 'odl-global-settings'
+            global-settings-type: cfp
         - inject:
             properties-file: env.properties
         - maven-target:
@@ -117,9 +115,6 @@
                 - include-raw-cleanup-docker.sh
         - jacoco-nojava-workaround
 
-    reporters:
-        - findbugs
-
     publishers:
         - sonar:
             language: 'java'
@@ -127,5 +122,6 @@
         - email-notification:
             email-prefix: '[netvirt]'
         - jacoco-report
+        - findbugs
         - opendaylight-infra-shiplogs:
             maven-version: '{mvn33}'

diff --git a/jjb/ovsdb/ovsdb-sonar.yaml b/jjb/ovsdb/ovsdb-sonar.yaml
index 42352fe9a9a3016199f2195007e38196e9f2be47..e152eeaa0d918e4a8073dfb0a0d101782fef9c6e 100644 (file)
--- a/jjb/ovsdb/ovsdb-sonar.yaml
+++ b/jjb/ovsdb/ovsdb-sonar.yaml
@@ -9,7 +9,7 @@
 - job-template:
     name: 'ovsdb-sonar'
 
-    project-type: maven
+    project-type: freestyle
     node: centos7-docker-2c-4g
     jdk: '{jdk}'
 
@@ -40,22 +40,20 @@
         - gerrit-trigger-patch-sonar:
             name: 'ovsdb'
 
-    prebuilders:
+    builders:
         - shell:
             !include-raw-escape:
                 - include-raw-setup-docker.sh
-
-    maven:
-        maven-name: '{mvn33}'
-        root-pom: 'pom.xml'
-        goals: 'clean install dependency:tree -V -B -Dsonar -Dskip.karaf.featureTest=true -Dmaven.compile.fork=true -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r'
-        maven-opts: '-Xmx1024m -XX:MaxPermSize=256m'
-        settings: 'ovsdb-settings'
-        settings-type: cfp
-        global-settings: 'odl-global-settings'
-        global-settings-type: cfp
-
-    postbuilders:
+        - maven-target:
+            maven-version: '{mvn33}'
+            pom: 'pom.xml'
+            goals: 'clean install dependency:tree -V -B -Dsonar -Dskip.karaf.featureTest=true -Dmaven.compile.fork=true -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r'
+            java-opts:
+                - '-Xmx1024m -XX:MaxPermSize=256m'
+            settings: 'ovsdb-settings'
+            settings-type: cfp
+            global-settings: 'odl-global-settings'
+            global-settings-type: cfp
         - inject:
             properties-file: env.properties
         - maven-target:

diff --git a/jjb/releng-templates-java.yaml b/jjb/releng-templates-java.yaml
index cb84eb8060cdc94f0463d20400ac618f8adc8755..58b1e517806e21e099bec4bf5cc304827c2b575f 100644 (file)
--- a/jjb/releng-templates-java.yaml
+++ b/jjb/releng-templates-java.yaml
@@ -469,7 +469,7 @@
     name: '{project-name}-sonar'
     disabled: false
 
-    project-type: maven
+    project-type: freestyle
     node: '{build-node}'
     jdk: 'openjdk8'
 
@@ -500,23 +500,20 @@
         - gerrit-trigger-patch-sonar:
             name: '{project}'
 
-    prebuilders:
+    builders:
         - jacoco-nojava-workaround
         - provide-maven-settings:
             global-settings-file: 'odl-global-settings'
             settings-file: '{mvn-settings}'
-
-    maven:
-        maven-name: '{mvn33}'
-        goals: '{mvn-goals} -V -B -Djenkins -Dsonar -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r'
-        maven-opts: '{mvn-opts}'
-        settings: '{mvn-settings}'
-        settings-type: cfp
-        global-settings: 'odl-global-settings'
-        global-settings-type: cfp
-
-    reporters:
-        - findbugs
+        - maven-target:
+            maven-version: '{mvn33}'
+            goals: '{mvn-goals} -V -B -Djenkins -Dsonar -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r'
+            maven-opts:
+              - '{mvn-opts}'
+            settings: '{mvn-settings}'
+            settings-type: cfp
+            global-settings: 'odl-global-settings'
+            global-settings-type: cfp
 
     publishers:
         - sonar:
@@ -525,6 +522,7 @@
         - email-notification:
             email-prefix: '[{project-name}]'
         - jacoco-report
+        - findbugs
         - opendaylight-infra-shiplogs:
             maven-version: '{mvn33}'