Remove unused ovs versions from full integration tests

[releng/builder.git] / jjb / ovsdb / ovsdb-full-integration.yaml

diff --git a/jjb/ovsdb/ovsdb-full-integration.yaml b/jjb/ovsdb/ovsdb-full-integration.yaml
index ac72fdd4fa41403b27f3aba8957703652952cfbb..efe8151b2fcdbcc527f3d140e4c81116f8de3888 100644 (file)
--- a/jjb/ovsdb/ovsdb-full-integration.yaml
+++ b/jjb/ovsdb/ovsdb-full-integration.yaml
@@ -37,24 +37,6 @@
             type: user-defined
             name: 'OVS_VERSION'
             values:
-                - 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 +83,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 +102,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: