X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=jjb%2Fovsdb%2Fovsdb-custom.yaml;h=66390b0d761c9cb1f642d1d2b6c9cb665539d308;hb=7ed341df6ac44ad368b365c849a1ae2675ccee0c;hp=5d5d7c7ca933f5f06e117dad7819d749e09de679;hpb=6ad4e05f7e9fca9cc5c30c83586c4f59d01697a6;p=releng%2Fbuilder.git

diff --git a/jjb/ovsdb/ovsdb-custom.yaml b/jjb/ovsdb/ovsdb-custom.yaml
index 5d5d7c7ca..66390b0d7 100644
--- a/jjb/ovsdb/ovsdb-custom.yaml
+++ b/jjb/ovsdb/ovsdb-custom.yaml
@@ -4,7 +4,7 @@
         - 'ovsdb-sonar'
 
     project: 'ovsdb'
-    jdk: 'openjdk7'
+    jdk: 'openjdk8'
 
 - job-template:
     name: 'ovsdb-sonar'
@@ -32,37 +32,43 @@
     wrappers:
         - build-timeout
         - ssh-agent-credentials:
-            user: '{ssh-credentials}'
+            users:
+                - '{ssh-credentials}'
 
     triggers:
-        - timed: 'H H * * *'
+        - timed: '@weekly'
+        - gerrit-trigger-patch-sonar:
+            name: 'ovsdb'
 
     prebuilders:
         - shell:
-            !include-raw-escape include-raw-setup-docker.sh
+            !include-raw-escape:
+                - include-raw-setup-docker.sh
 
     maven:
-        maven-name: '{mvn32}'
+        maven-name: '{mvn33}'
         root-pom: 'pom.xml'
-        goals: 'clean install -Pjenkins -V -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r  -Dsonar'
+        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'
         maven-opts: '-Xmx1024m -XX:MaxPermSize=256m'
         settings: '{ovsdb-settings}'
         global-settings: '{odl-global-settings}'
 
     postbuilders:
+        - inject:
+            properties-file: env.properties
         - maven-target:
-            maven-version: '{mvn32}'
+            maven-version: '{mvn33}'
             pom: 'pom.xml'
-            goals: 'verify -Pintegrationtest,coverage,jenkins -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r  -Dsonar'
+            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 '
             properties:
                 - 'ovsdbserver.ipaddress=127.0.0.1'
                 - 'ovsdbserver.port=6641'
+                - 'ovsdb.userspace.enabled=yes'
             settings: '{ovsdb-settings}'
             global-settings: '{odl-global-settings}'
-        - inject:
-            properties-file: env.properties
         - shell:
-            !include-raw-escape include-raw-cleanup-docker.sh
+            !include-raw-escape:
+                - include-raw-cleanup-docker.sh
         - jacoco-nojava-workaround
 
     publishers: