X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=jjb%2Fovsdb%2Fovsdb-full-integration.yaml;h=d6fb1ad27409a431c54c5743701c4c1122b66ece;hb=7a397460a4ddc2688675322b0963704500ec3e94;hp=a52e8e8495a0b00e26ec16ec175fb7d39f49564b;hpb=7a486d895bdbc608d4b03e3f765dd50b7592ff85;p=releng%2Fbuilder.git

diff --git a/jjb/ovsdb/ovsdb-full-integration.yaml b/jjb/ovsdb/ovsdb-full-integration.yaml
index a52e8e849..d6fb1ad27 100644
--- a/jjb/ovsdb/ovsdb-full-integration.yaml
+++ b/jjb/ovsdb/ovsdb-full-integration.yaml
@@ -6,16 +6,21 @@
     # stream:    release stream (eg. stable-lithium or beryllium)
     # branch:    git branch (eg. stable/lithium or master)
     stream:
-        - beryllium:
+        - boron:
             branch: 'master'
             jdk: openjdk8
             jdks:
                 - openjdk8
-        - stable-lithium:
-            branch: 'stable/lithium'
+        - beryllium:
+            branch: 'stable/beryllium'
             jdk: openjdk8
             jdks:
                 - openjdk8
+        - stable-lithium:
+            branch: 'stable/lithium'
+            jdk: openjdk7
+            jdks:
+                - openjdk7
 
     project: 'ovsdb'
 
@@ -37,21 +42,12 @@
             type: user-defined
             name: 'OVS_VERSION'
             values:
-                - 1.4.6
-                - 1.5.0
-                - 1.6.1
-                - 1.7.3
-                - 1.9.3
-                - 1.10.2
-                - 1.11.0
-                - 2.0.1
-                - 2.1.2
                 - 2.3.2
                 - 2.4.0
         - axis:
             type: jdk
-            values:
-                - openjdk8
+            values: '{obj:jdks}'
+
         - axis:
             type: slave
             name: nodes
@@ -92,13 +88,14 @@
     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 -Dovsdb.controller.address=${{CONTROLLER_IP}}'
+            goals: 'clean install -V verify -Pintegrationtest -Dskip.karaf.featureTest=true -Dmaven.compile.fork=true -Dovsdb.controller.address=${{CONTROLLER_IP}}'
             properties:
                 - 'ovsdbserver.ipaddress=127.0.0.1'
                 - 'ovsdbserver.port=6641'
@@ -111,7 +108,8 @@
             settings: '{ovsdb-settings}'
             global-settings: '{odl-global-settings}'
         - shell:
-            !include-raw-escape include-raw-cleanup-docker.sh
+            !include-raw-escape:
+                - include-raw-cleanup-docker.sh
         - jacoco-nojava-workaround
 
     publishers: