X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=jjb%2Fovsdb%2Fovsdb-sonar.yaml;h=e7fe9d2e64219442691e753f0d0dd85ba9cf7680;hb=88381e42f55aea865e5f4cf22d1a15d85aa75caa;hp=67e97b3c638b4cdccd915bfb27a9e28f1e3eb80b;hpb=46313e991d5842b96d03f74dd153d07f2669e320;p=releng%2Fbuilder.git

diff --git a/jjb/ovsdb/ovsdb-sonar.yaml b/jjb/ovsdb/ovsdb-sonar.yaml
index 67e97b3c6..e7fe9d2e6 100644
--- a/jjb/ovsdb/ovsdb-sonar.yaml
+++ b/jjb/ovsdb/ovsdb-sonar.yaml
@@ -1,96 +1,114 @@
+---
 - project:
     name: ovsdb-sonar
     jobs:
-        - 'ovsdb-sonar'
+      - "ovsdb-sonar"
 
-    project: 'ovsdb'
-    jdk: 'openjdk8'
+    project: "ovsdb"
+    jdk: "openjdk8"
 
 - job-template:
-    name: 'ovsdb-sonar'
+    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:
-            build-days-to-keep: 7
+      - opendaylight-infra-properties:
+          build-days-to-keep: 7
 
     parameters:
-        - opendaylight-infra-parameters:
-            project: '{project}'
-            branch: '{branch}'
-            refspec: 'refs/heads/{branch}'
-            artifacts: '{archive-artifacts}'
+      - opendaylight-infra-parameters:
+          os-cloud: "{os-cloud}"
+          project: "{project}"
+          branch: "{branch}"
+          refspec: "refs/heads/{branch}"
+          artifacts: "{archive-artifacts}"
 
     scm:
-        - git-scm:
-            refspec: ''
-            branch: 'master'
+      - git-scm:
+          refspec: ""
+          branch: "master"
 
     wrappers:
-        - opendaylight-infra-wrappers:
-            build-timeout: '{build-timeout}'
+      - opendaylight-infra-wrappers:
+          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
-        - inject:
-            properties-file: env.properties
-        - shell:
-            !include-raw-escape:
-                - include-setup-hwvtep-docker.sh
-        - maven-target:
-            maven-version: 'mvn33'
-            pom: 'pom.xml'
-            goals: 'clean install dependency:tree -V -B -Dsonar -Dskip.karaf.featureTest=true -Dmaven.compile.fork=true -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r'
-            java-opts:
-                - '-Xmx1024m -XX:MaxPermSize=256m'
-            settings: 'ovsdb-settings'
-            settings-type: cfp
-            global-settings: 'odl-global-settings'
-            global-settings-type: cfp
-        - inject:
-            properties-file: env.properties
-        - maven-target:
-            maven-version: 'mvn33'
-            pom: 'pom.xml'
-            goals: '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 '
-            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-type: cfp
-        - maven-target:
-            maven-version: 'mvn33'
-            # We should switch to the recommended configuration of sonar once
-            # JJB adds support for configurating the Sonar wrapper:
-            #    http://docs.sonarqube.org/display/SCAN/Analyzing+with+SonarQube+Scanner+for+Jenkins
-            goals: 'sonar:sonar -V -B -Djenkins -Dsonar -Dsonar.host.url=https://sonar.opendaylight.org -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-type: cfp
-        - shell:
-            !include-raw-escape:
-                - include-raw-cleanup-docker.sh
-        - jacoco-nojava-workaround
+      - 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: "mvn35"
+          pom: "pom.xml"
+          goals: >
+            clean install dependency:tree -V -B -Dsonar
+            -Dskip.karaf.featureTest=true -Dmaven.compile.fork=true
+            -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r
+          java-opts:
+            - "-Xmx1024m"
+          settings: "ovsdb-settings"
+          settings-type: cfp
+          global-settings: "global-settings"
+          global-settings-type: cfp
+      - inject:
+          properties-file: env.properties
+      - maven-target:
+          maven-version: "mvn35"
+          pom: "pom.xml"
+          goals: >
+            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
+          properties:
+            - "ovsdbserver.ipaddress=127.0.0.1"
+            - "ovsdbserver.port=6641"
+            - "ovsdb.userspace.enabled=yes"
+          settings: "ovsdb-settings"
+          settings-type: cfp
+          global-settings: "global-settings"
+          global-settings-type: cfp
+      - maven-target:
+          maven-version: "mvn35"
+          # We should switch to the recommended configuration of sonar once
+          # JJB adds support for configurating the Sonar wrapper:
+          #    http://docs.sonarqube.org/display/SCAN/Analyzing+with+SonarQube+Scanner+for+Jenkins
+          goals: >
+            sonar:sonar -V -B -Djenkins -Dsonar
+            -Dsonar.host.url=https://sonar.opendaylight.org
+            -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r
+          settings: "ovsdb-settings"
+          settings-type: cfp
+          global-settings: "global-settings"
+          global-settings-type: cfp
+      - 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'
+      - email-notification:
+          email-recipients: "{email-recipients}"
+          email-prefix: "[ovsdb]"
+      - lf-jacoco-report
+      - lf-infra-publish