X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=jjb%2Fovsdb%2Fovsdb-sonar.yaml;h=f669024a6467ad00903f610462411fd6aa54fcb6;hb=8d12b324463c0e3357d7eb2f52e63319d0ef9068;hp=69d59299d8cbbff2302d9acc04f526a64a2cd525;hpb=cb3cedbb503dbc2c5b86d64af31a2962088f12e7;p=releng%2Fbuilder.git

diff --git a/jjb/ovsdb/ovsdb-sonar.yaml b/jjb/ovsdb/ovsdb-sonar.yaml
index 69d59299d..f669024a6 100644
--- a/jjb/ovsdb/ovsdb-sonar.yaml
+++ b/jjb/ovsdb/ovsdb-sonar.yaml
@@ -1,7 +1,8 @@
+---
 - project:
     name: ovsdb-sonar
     jobs:
-        - 'ovsdb-sonar'
+      - 'ovsdb-sonar'
 
     project: 'ovsdb'
     jdk: 'openjdk8'
@@ -13,84 +14,88 @@
     node: centos7-docker-2c-4g
     jdk: '{jdk}'
 
-    logrotate:
-        daysToKeep: '7'
-        numToKeep: '10'
-        artifactDaysToKeep: '1'
-        artifactNumToKeep: '1'
+    properties:
+      - 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:
-            name: 'ovsdb'
+      - timed: 'H H * * 6'
+      - gerrit-trigger-patch-sonar:
+          server-name: '{server-name}'
+          name: 'ovsdb'
 
     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: 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: '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: '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: 'global-settings'
+          global-settings-type: cfp
+      - shell: !include-raw-escape: include-raw-cleanup-docker.sh
+      - jacoco-nojava-workaround
 
     publishers:
-        - email-notification:
-            email-prefix: '[ovsdb]'
-        - jacoco-report
-        - opendaylight-infra-shiplogs:
-            maven-version: '{mvn33}'
+      - email-notification:
+          email-recipients: '{email-recipients}'
+          email-prefix: '[ovsdb]'
+      - jacoco-report
+      - lf-infra-publish