Merge "Update CentOS7 docker images"

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

diff --git a/jjb/ovsdb/ovsdb-sonar.yaml b/jjb/ovsdb/ovsdb-sonar.yaml
index 96ef8d750367efaa02d87a634ce111ba2cd61e3c..f669024a6467ad00903f610462411fd6aa54fcb6 100644 (file)
--- a/jjb/ovsdb/ovsdb-sonar.yaml
+++ b/jjb/ovsdb/ovsdb-sonar.yaml
@@ -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,7 +88,7 @@
               -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
       - jacoco-nojava-workaround
@@ -98,5 +98,4 @@
           email-recipients: '{email-recipients}'
           email-prefix: '[ovsdb]'
       - jacoco-report
-      - opendaylight-infra-shiplogs:
-          maven-version: 'mvn33'
+      - lf-infra-publish