Switch to using global-jjb lf-jacoco-report macro

[releng/builder.git] / jjb / ovsdb / ovsdb-sonar.yaml

diff --git a/jjb/ovsdb/ovsdb-sonar.yaml b/jjb/ovsdb/ovsdb-sonar.yaml
index 0725dbf9809bc40bf50f5bfa287661b79f1fdfdb..67ba74dad54f6bd3a8edab2245d709d268cdfdeb 100644 (file)
--- a/jjb/ovsdb/ovsdb-sonar.yaml
+++ b/jjb/ovsdb/ovsdb-sonar.yaml
@@ -20,6 +20,7 @@
 
     parameters:
       - opendaylight-infra-parameters:
+          os-cloud: '{os-cloud}'
           project: '{project}'
           branch: '{branch}'
           refspec: 'refs/heads/{branch}'
@@ -35,13 +36,13 @@
           build-timeout: '{build-timeout}'
 
     triggers:
-      - timed: 'H H * * 6'
+      - timed: '{schedule-saturday}'
       - gerrit-trigger-patch-sonar:
           server-name: '{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
@@ -56,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
@@ -74,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'
@@ -87,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