X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=jjb%2Fovsdb%2Fovsdb-sonar.yaml;h=a1cd88cfdc3225aea818d8f34827caf9043620a6;hb=67d39f91fd1324def62e969b2bfce675eb8de695;hp=42352fe9a9a3016199f2195007e38196e9f2be47;hpb=3d206add25e3de18f36896ec005a6ce009dfcfc4;p=releng%2Fbuilder.git

diff --git a/jjb/ovsdb/ovsdb-sonar.yaml b/jjb/ovsdb/ovsdb-sonar.yaml
index 42352fe9a..a1cd88cfd 100644
--- 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,26 +40,29 @@
         - 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:
         - inject:
             properties-file: env.properties
+        - shell:
+            !include-raw-escape:
+                - include-setup-hwvtep-docker.sh
         - maven-target:
-            maven-version: '{mvn33}'
+            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:
+            maven-version: 'mvn33'
             pom: 'pom.xml'
             goals: 'verify -V -B -Pintegrationtest -Dsonar -Dskip.karaf.featureTest=true -Dovsdb.controller.address=${{CONTROLLER_IP}} -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r '
             properties:
@@ -70,17 +73,25 @@
             settings-type: cfp
             global-settings: 'odl-global-settings'
             global-settings-type: cfp
+        - maven-target:
+            maven-version: 'mvn33'
+            # We should switch to the recommended configuration of sonar once
+            # JJB adds support for configurating the Sonar wrapper:
+            #    http://docs.sonarqube.org/display/SCAN/Analyzing+with+SonarQube+Scanner+for+Jenkins
+            goals: 'sonar:sonar -V -B -Djenkins -Dsonar -Dsonar.host.url=https://sonar.opendaylight.org -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r'
+            settings: 'ovsdb-settings'
+            settings-type: cfp
+            global-settings: 'odl-global-settings'
+            global-settings-type: cfp
         - shell:
             !include-raw-escape:
                 - include-raw-cleanup-docker.sh
         - jacoco-nojava-workaround
 
     publishers:
-        - sonar:
-            language: 'java'
-            maven-opts: '-Xmx6144m -XX:MaxPermSize=1024m'
         - email-notification:
+            email-recipients: '{email-recipients}'
             email-prefix: '[ovsdb]'
         - jacoco-report
         - opendaylight-infra-shiplogs:
-            maven-version: '{mvn33}'
+            maven-version: 'mvn33'