Merge "Update RPM tests to Oxygen SR4"

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

diff --git a/jjb/ovsdb/ovsdb-sonar.yaml b/jjb/ovsdb/ovsdb-sonar.yaml
index 0725dbf9809bc40bf50f5bfa287661b79f1fdfdb..ac657e5cd5c967a6523a86f6ff19b6cd37c10b43 100644 (file)
--- 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:
@@ -20,6 +20,7 @@
 
     parameters:
       - opendaylight-infra-parameters:
+          os-cloud: '{os-cloud}'
           project: '{project}'
           branch: '{branch}'
           refspec: 'refs/heads/{branch}'
@@ -35,18 +36,31 @@
           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
@@ -56,7 +70,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
@@ -67,14 +81,14 @@
               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'
             - '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 +101,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
-      - 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
-      - opendaylight-infra-shiplogs:
-          maven-version: 'mvn33'
+      - lf-jacoco-report
+      - lf-infra-publish