X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=jjb%2Fovsdb%2Fovsdb-sonar.yaml;h=a223c54200656cf06cb2febafb5981efff9fd0ae;hb=32e2d836e744077e3878000e136445d403584982;hp=f669024a6467ad00903f610462411fd6aa54fcb6;hpb=8d12b324463c0e3357d7eb2f52e63319d0ef9068;p=releng%2Fbuilder.git

diff --git a/jjb/ovsdb/ovsdb-sonar.yaml b/jjb/ovsdb/ovsdb-sonar.yaml
index f669024a6..a223c5420 100644
--- a/jjb/ovsdb/ovsdb-sonar.yaml
+++ b/jjb/ovsdb/ovsdb-sonar.yaml
@@ -11,8 +11,8 @@
     name: 'ovsdb-sonar'
 
     project-type: freestyle
-    node: centos7-docker-2c-4g
-    jdk: '{jdk}'
+    node: centos7-docker-1c-4g
+    jdk: '{java-version}'
 
     properties:
       - opendaylight-infra-properties:
@@ -36,25 +36,38 @@
           build-timeout: '{build-timeout}'
 
     triggers:
-      - timed: 'H H * * 6'
-      - gerrit-trigger-patch-sonar:
-          server-name: '{server-name}'
-          name: 'ovsdb'
+      - timed: '{schedule-saturday}'
+      - gerrit:
+          server-name: '{gerrit-server-name}'
+          trigger-on:
+            - comment-added-contains-event:
+                comment-contains-value: 'run-sonar$'
+          projects:
+            - project-compare-type: 'ANT'
+              project-pattern: '{project}'
+              branches:
+                - branch-compare-type: 'ANT'
+                  branch-pattern: '**/master'
+          skip-vote:
+            successful: true
+            failed: true
+            unstable: true
+            notbuilt: true
 
     builders:
-      - shell: !include-raw-escape: include-raw-setup-docker.sh
+      - shell: !include-raw-escape: setup-docker.sh
       - inject:
           properties-file: env.properties
       - shell: !include-raw-escape: include-setup-hwvtep-docker.sh
       - maven-target:
-          maven-version: 'mvn33'
+          maven-version: 'mvn35'
           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'
+            - '-Xmx1024m'
           settings: 'ovsdb-settings'
           settings-type: cfp
           global-settings: 'global-settings'
@@ -62,13 +75,13 @@
       - inject:
           properties-file: env.properties
       - maven-target:
-          maven-version: 'mvn33'
+          maven-version: 'mvn35'
           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
+              -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r
           properties:
             - 'ovsdbserver.ipaddress=127.0.0.1'
             - 'ovsdbserver.port=6641'
@@ -78,7 +91,7 @@
           global-settings: 'global-settings'
           global-settings-type: cfp
       - maven-target:
-          maven-version: 'mvn33'
+          maven-version: 'mvn35'
           # 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
@@ -90,12 +103,12 @@
           settings-type: cfp
           global-settings: 'global-settings'
           global-settings-type: cfp
-      - shell: !include-raw-escape: include-raw-cleanup-docker.sh
-      - jacoco-nojava-workaround
+      - shell: !include-raw-escape: cleanup-docker.sh
+      - lf-jacoco-nojava-workaround
 
     publishers:
       - email-notification:
           email-recipients: '{email-recipients}'
           email-prefix: '[ovsdb]'
-      - jacoco-report
+      - lf-jacoco-report
       - lf-infra-publish