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

diff --git a/jjb/ovsdb/ovsdb-full-integration.yaml b/jjb/ovsdb/ovsdb-full-integration.yaml
index 8bac0764a..bd90efb57 100644
--- a/jjb/ovsdb/ovsdb-full-integration.yaml
+++ b/jjb/ovsdb/ovsdb-full-integration.yaml
@@ -1,18 +1,37 @@
 - project:
     name: ovsdb-full-integration
     jobs:
-        - 'ovsdb-daily-full-integration'
+        - 'ovsdb-daily-full-integration-{stream}'
+
+    # stream:    release stream (eg. stable-lithium or beryllium)
+    # branch:    git branch (eg. stable/lithium or master)
+    stream:
+        - beryllium:
+            branch: 'master'
+            jdk: openjdk8
+            jdks:
+                - openjdk8
+        - stable-lithium:
+            branch: 'stable/lithium'
+            jdk: openjdk8
+            jdks:
+                - openjdk8
 
     project: 'ovsdb'
 
 - job-template:
-    name: 'ovsdb-daily-full-integration'
+    name: 'ovsdb-daily-full-integration-{stream}'
+
+    # Required Variables:
+    #     stream:    release stream (eg. stable-lithium or beryllium)
+    #     branch:    git branch (eg. stable/lithium or master)
 
     project-type: matrix
     node: matrix_master
-    description: 'Integration tests for the OVSDB project against every known version of OVS. This job runs nightly. '
+    description: 'Integration tests for the OVSDB project against different versions of OVS and branches. This job runs nightly. '
     execution-strategy:
         sequential: true
+
     axes:
         - axis:
             type: user-defined
@@ -21,24 +40,18 @@
                 - 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.2
+                - 2.4.0
         - axis:
             type: jdk
             values:
-                - openjdk7
+                - openjdk8
         - axis:
             type: slave
             name: nodes
@@ -54,12 +67,14 @@
     parameters:
         - project-parameter:
             project: '{project}'
+        - gerrit-parameter:
+            branch: '{branch}'
 
     scm:
         - git-scm:
             credentials-id: '{ssh-credentials}'
             refspec: ''
-            branch: 'master'
+            branch: '{branch}'
 
     wrappers:
         - timeout:
@@ -77,24 +92,28 @@
     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: '{mvn32}'
+            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}'
             java-opts:
                 - '-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: