X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;ds=sidebyside;f=jjb%2Fovsdb%2Fovsdb-full-integration.yaml;h=bd90efb5798833f982d0df7ebc3beef509960326;hb=7365c119f2d01195da6a1877b106847be000e01a;hp=ac72fdd4fa41403b27f3aba8957703652952cfbb;hpb=73dbe915f1f57685c387fc1db5921ae40b8ee0a9;p=releng%2Fbuilder.git

diff --git a/jjb/ovsdb/ovsdb-full-integration.yaml b/jjb/ovsdb/ovsdb-full-integration.yaml
index ac72fdd4f..bd90efb57 100644
--- a/jjb/ovsdb/ovsdb-full-integration.yaml
+++ b/jjb/ovsdb/ovsdb-full-integration.yaml
@@ -40,21 +40,12 @@
                 - 1.4.6
                 - 1.5.0
                 - 1.6.1
-                - 1.7.0
-                - 1.7.1
                 - 1.7.3
-                - 1.9.0
                 - 1.9.3
-                - 1.10.0
                 - 1.10.2
                 - 1.11.0
-                - 2.0.0
                 - 2.0.1
-                - 2.1.0
-                - 2.1.1
                 - 2.1.2
-                - 2.3.0
-                - 2.3.1
                 - 2.3.2
                 - 2.4.0
         - axis:
@@ -101,14 +92,18 @@
     builders:
         - wipe-org-opendaylight-repo
         - shell:
-            !include-raw-escape include-raw-setup-docker.sh
+            !include-raw-escape:
+                - include-raw-setup-docker.sh
+        - inject:
+            properties-file: env.properties
         - maven-target:
             maven-version: '{mvn33}'
             pom: 'pom.xml'
-            goals: 'clean install verify -Pintegrationtest,jenkins -V'
+            goals: 'clean install verify -Pintegrationtest,jenkins -V -Dovsdb.controller.address=${{CONTROLLER_IP}}'
             properties:
                 - 'ovsdbserver.ipaddress=127.0.0.1'
                 - 'ovsdbserver.port=6641'
+                - 'ovsdb.userspace.enabled=yes'
                 - 'maven.repo.local=/tmp/r'
                 - 'org.ops4j.pax.url.mvn.localRepository=/tmp/r'
                 - 'stream={stream}'
@@ -116,10 +111,9 @@
                 - '-Xmx1024m -XX:MaxPermSize=256m'
             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: