X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=jjb%2Fovsdb%2Fovsdb-sonar.yaml;h=47413b7095846a3f9e4259633334d64c0b266b6b;hb=a27b4bff5438d6b3ab9a1b1cab0ee5953f0cc420;hp=96ef8d750367efaa02d87a634ce111ba2cd61e3c;hpb=4b83ecbf0a1eb4f2bf88bb36473d98de28ff8da5;p=releng%2Fbuilder.git

diff --git a/jjb/ovsdb/ovsdb-sonar.yaml b/jjb/ovsdb/ovsdb-sonar.yaml
index 96ef8d750..47413b709 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,13 +36,13 @@
           build-timeout: '{build-timeout}'
 
     triggers:
-      - timed: 'H H * * 6'
+      - timed: '{schedule-saturday}'
       - gerrit-trigger-patch-sonar:
-          server-name: '{server-name}'
+          gerrit-server-name: '{gerrit-server-name}'
           name: 'ovsdb'
 
     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
@@ -57,7 +57,7 @@
             - '-Xmx1024m -XX:MaxPermSize=256m'
           settings: 'ovsdb-settings'
           settings-type: cfp
-          global-settings: 'odl-global-settings'
+          global-settings: 'global-settings'
           global-settings-type: cfp
       - inject:
           properties-file: env.properties
@@ -75,7 +75,7 @@
             - 'ovsdb.userspace.enabled=yes'
           settings: 'ovsdb-settings'
           settings-type: cfp
-          global-settings: 'odl-global-settings'
+          global-settings: 'global-settings'
           global-settings-type: cfp
       - maven-target:
           maven-version: 'mvn33'
@@ -88,15 +88,14 @@
               -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: 'global-settings'
           global-settings-type: cfp
-      - shell: !include-raw-escape: include-raw-cleanup-docker.sh
+      - shell: !include-raw-escape: cleanup-docker.sh
       - jacoco-nojava-workaround
 
     publishers:
       - email-notification:
           email-recipients: '{email-recipients}'
           email-prefix: '[ovsdb]'
-      - jacoco-report
-      - opendaylight-infra-shiplogs:
-          maven-version: 'mvn33'
+      - lf-jacoco-report
+      - lf-infra-publish