Merge "Remove jjb custom scripting"

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

diff --git a/jjb/netvirt/netvirt-sonar.yaml b/jjb/netvirt/netvirt-sonar.yaml
index c8c2d7053b6951786e1d37849665d3c93cb27a63..5eda1eff82e3f69000d5b1a00bc43f8033d434ec 100644 (file)
--- a/jjb/netvirt/netvirt-sonar.yaml
+++ b/jjb/netvirt/netvirt-sonar.yaml
@@ -10,7 +10,7 @@
     name: 'netvirt-sonar'
 
     project-type: maven
-    node: dynamic_docker
+    node: centos7-docker-2c-4g
     jdk: '{jdk}'
 
     logrotate:
@@ -20,20 +20,20 @@
         artifactNumToKeep: '1'
 
     parameters:
-        - project-parameter:
+        - opendaylight-infra-parameters:
             project: '{project}'
+            branch: '{branch}'
+            refspec: 'refs/heads/{branch}'
+            artifacts: '{archive-artifacts}'
 
     scm:
         - git-scm:
-            credentials-id: '{ssh-credentials}'
             refspec: ''
             branch: 'master'
 
     wrappers:
-        - build-timeout
-        - ssh-agent-credentials:
-            users:
-                - '{ssh-credentials}'
+        - opendaylight-infra-wrappers:
+            build-timeout: '{build-timeout}'
 
     triggers:
         - timed: 'H H * * 6'
@@ -48,10 +48,12 @@
     maven:
         maven-name: '{mvn33}'
         root-pom: 'pom.xml'
-        goals: 'clean install -V -Dsonar -Dskip.karaf.featureTest=true -Dmaven.compile.fork=true -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r'
+        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'
         maven-opts: '-Xmx1024m -XX:MaxPermSize=256m'
-        settings: '{netvirt-settings}'
-        global-settings: '{odl-global-settings}'
+        settings: 'netvirt-settings'
+        settings-type: cfp
+        global-settings: 'odl-global-settings'
+        global-settings-type: cfp
 
     postbuilders:
         - inject:
@@ -59,13 +61,15 @@
         - maven-target:
             maven-version: '{mvn33}'
             pom: 'pom.xml'
-            goals: 'verify -V -Pintegrationtest -Dsonar -Dskip.karaf.featureTest=true -Dovsdb.controller.address=${{CONTROLLER_IP}} -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r '
+            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: '{netvirt-settings}'
-            global-settings: '{odl-global-settings}'
+            settings: 'netvirt-settings'
+            settings-type: cfp
+            global-settings: 'odl-global-settings'
+            global-settings-type: cfp
         - shell:
             !include-raw-escape:
                 - include-raw-cleanup-docker.sh
@@ -81,3 +85,5 @@
         - email-notification:
             email-prefix: '[netvirt]'
         - jacoco-report
+        - archive-build:
+            maven-version: '{mvn33}'