Merge "Add method to not trigger downstream ar-jobs"

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

diff --git a/jjb/ovsdb/ovsdb-sonar.yaml b/jjb/ovsdb/ovsdb-sonar.yaml
index 9deb830e73764d8ee5b411d88a1f8e90c57e5918..0fd1c418af72c5a85edf9ccff9f10d8873a5000d 100644 (file)
--- a/jjb/ovsdb/ovsdb-sonar.yaml
+++ b/jjb/ovsdb/ovsdb-sonar.yaml
@@ -42,7 +42,7 @@
           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,9 +88,9 @@
               -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: