Merge "Revert autorelease builders back to 4c-16g"

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

diff --git a/jjb/ovsdb/ovsdb-sonar.yaml b/jjb/ovsdb/ovsdb-sonar.yaml
index 257c99ab03b71a69afd984303e69675992437342..521a9098e420d80c916336a4fd791d38e4d7cd00 100644 (file)
--- a/jjb/ovsdb/ovsdb-sonar.yaml
+++ b/jjb/ovsdb/ovsdb-sonar.yaml
@@ -60,7 +60,7 @@
           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
@@ -75,13 +75,13 @@
       - inject:
           properties-file: env.properties
       - maven-target:
-          maven-version: 'mvn33'
+          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
+              -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r
           properties:
             - 'ovsdbserver.ipaddress=127.0.0.1'
             - 'ovsdbserver.port=6641'
@@ -91,7 +91,7 @@
           global-settings: 'global-settings'
           global-settings-type: cfp
       - maven-target:
-          maven-version: 'mvn33'
+          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
@@ -104,7 +104,7 @@
           global-settings: 'global-settings'
           global-settings-type: cfp
       - shell: !include-raw-escape: cleanup-docker.sh
-      - jacoco-nojava-workaround
+      - lf-jacoco-nojava-workaround
 
     publishers:
       - email-notification: