Split OVSDB IT into 4 targets

The 4 targets are:
1. build OVSDB
2. southbound-it
3. library-it
4. hwvtepsouthbound-it

For each OVS version (2.4.0, 2.5.0):
run 2-4 above.

For now, removed OVS 2.3.3, as there is a packaging
issue in the Docker 2.3.3 image that is causing
an error starting the HWVTEP emulator.

Change-Id: Ifff0353f7176a7dec1b7d4f10e2d5ee4a72d7b59
Signed-off-by: Victor Pickard <vpickard@redhat.com>

diff --git a/jjb/ovsdb/include-setup-hwvtep-docker.sh b/jjb/ovsdb/include-setup-hwvtep-docker.sh
index 7042ef5f19ba9e74cd0a0ef9efe9d448435d9447..ed0f9c4f0d92bd9e6fb3bd9affbedb684615b775 100644 (file)
--- a/jjb/ovsdb/include-setup-hwvtep-docker.sh
+++ b/jjb/ovsdb/include-setup-hwvtep-docker.sh
@@ -4,7 +4,6 @@ set -e
 
 echo "---> Configuring OVS for HW VTEP Emulator"
 /usr/bin/docker exec $CID supervisorctl stop ovsdb-server
-sleep 5
 /usr/bin/docker exec $CID supervisorctl start ovsdb-server-vtep
 /usr/bin/docker exec $CID ovs-vsctl add-br br-vtep
 /usr/bin/docker exec $CID ovs-vsctl add-port br-vtep eth0
@@ -12,7 +11,7 @@ sleep 5
 /usr/bin/docker exec $CID vtep-ctl add-port br-vtep eth0
 /usr/bin/docker exec $CID vtep-ctl set Physical_Switch br-vtep tunnel_ips=192.168.254.20
 /usr/bin/docker exec $CID vtep-ctl set-manager ptcp:6640
-
+sleep 5
 echo "---> Starting OVS HW VTEP Emulator"
 /usr/bin/docker exec $CID supervisorctl start ovs-vtep
-sleep 10
+sleep 5

diff --git a/jjb/ovsdb/ovsdb-full-integration.yaml b/jjb/ovsdb/ovsdb-full-integration.yaml
index bf85ee7e1e5cbf4ed18f1bbc0fcb7013b24bec56..863c55435717589e1d39d654631fea674472ae10 100644 (file)
--- a/jjb/ovsdb/ovsdb-full-integration.yaml
+++ b/jjb/ovsdb/ovsdb-full-integration.yaml
@@ -25,6 +25,83 @@
     project: 'ovsdb'
     archive-artifacts: '*.log'
 
+- builder:
+    name: run-it
+    builders:
+        - maven-target:
+            maven-version: '{maven-version}'
+            pom: '{pomFile}'
+            goals: '-V -B verify -l {logfile} -Pintegrationtest -Dskip.karaf.featureTest=true -Dmaven.compile.fork=true -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'
+            settings-type: cfp
+            global-settings: 'odl-global-settings'
+            global-settings-type: cfp
+
+- builder:
+    name: run-library-it
+    builders:
+        - run-it:
+            maven-version: '{maven-version}'
+            stream: '{stream}'
+            pomFile: 'library/it/pom.xml'
+            logfile: '{OVS_VERSION}-libraryIT.log'
+
+- builder:
+    name: run-southbound-it
+    builders:
+        - run-it:
+            maven-version: '{maven-version}'
+            stream: '{stream}'
+            pomFile: 'southbound/southbound-it/pom.xml'
+            logfile: '{OVS_VERSION}-southboundIT.log'
+
+- builder:
+    name: run-hwvtepsouthbound-it
+    builders:
+        - run-it:
+            maven-version: '{maven-version}'
+            stream: '{stream}'
+            pomFile: 'hwvtepsouthbound/hwvtepsouthbound-it/pom.xml'
+            logfile: '{OVS_VERSION}-hwvtepsouthboundIT.log'
+
+- builder:
+    name: run-ovsdb-it
+    builders:
+        - inject:
+            properties-content: OVS_VERSION={OVS_VERSION}
+        - shell:
+            !include-raw-escape:
+                - include-raw-setup-docker.sh
+        - inject:
+            properties-file: env.properties
+        - run-southbound-it:
+            OVS_VERSION: '{OVS_VERSION}'
+            maven-version: '{maven-version}'
+            stream: '{stream}'
+        - shell:
+            !include-raw-escape:
+                - include-setup-hwvtep-docker.sh
+        - run-library-it:
+            OVS_VERSION: '{OVS_VERSION}'
+            maven-version: '{maven-version}'
+            stream: '{stream}'
+        - run-hwvtepsouthbound-it:
+            OVS_VERSION: '{OVS_VERSION}'
+            maven-version: '{maven-version}'
+            stream: '{stream}'
+        - shell:
+            !include-raw-escape:
+                - include-raw-cleanup-docker.sh
+
 - job-template:
     name: 'ovsdb-daily-full-integration-{stream}'
 
@@ -32,29 +109,10 @@
     #     stream:    release stream (eg. stable-lithium or beryllium)
     #     branch:    git branch (eg. stable/lithium or master)
 
-    project-type: matrix
-    node: matrix_master
+    project-type: freestyle
+    node: centos7-docker-2c-4g
+    jdk: '{jdk}'
     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
-            name: 'OVS_VERSION'
-            values:
-                - 2.3.3
-                - 2.4.0
-                - 2.5.0
-        - axis:
-            type: jdk
-            values: '{obj:jdks}'
-
-        - axis:
-            type: slave
-            name: nodes
-            values:
-                - centos7-docker-2c-4g
 
     logrotate:
         daysToKeep: '{build-days-to-keep}'
@@ -100,11 +158,6 @@
 
     builders:
         - wipe-org-opendaylight-repo
-        - shell:
-            !include-raw-escape:
-                - include-raw-setup-docker.sh
-        - inject:
-            properties-file: env.properties
         - maven-target:
             maven-version: '{mvn33}'
             pom: 'pom.xml'
@@ -119,64 +172,14 @@
             settings-type: cfp
             global-settings: 'odl-global-settings'
             global-settings-type: cfp
-        - maven-target:
+        - run-ovsdb-it:
             maven-version: '{mvn33}'
-            pom: 'southbound/southbound-it/pom.xml'
-            goals: '-V -B verify -l southboundIT.log -Pintegrationtest -Dskip.karaf.featureTest=true -Dmaven.compile.fork=true -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'
-            settings-type: cfp
-            global-settings: 'odl-global-settings'
-            global-settings-type: cfp
-        - shell:
-            !include-raw-escape:
-                - include-setup-hwvtep-docker.sh
-        - maven-target:
+            stream: '{stream}'
+            OVS_VERSION: '2.4.0'
+        - run-ovsdb-it:
             maven-version: '{mvn33}'
-            pom: 'library/it/pom.xml'
-            goals: '-V -B verify -l libraryIT.log -Pintegrationtest -Dskip.karaf.featureTest=true -Dmaven.compile.fork=true -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'
-            settings-type: cfp
-            global-settings: 'odl-global-settings'
-            global-settings-type: cfp
-        - maven-target:
-            maven-version: '{mvn33}'
-            pom: 'hwvtepsouthbound/hwvtepsouthbound-it/pom.xml'
-            goals: '-V -B verify -l hwvtepsouthboundIT.log -Pintegrationtest -Dskip.karaf.featureTest=true -Dmaven.compile.fork=true -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'
-            settings-type: cfp
-            global-settings: 'odl-global-settings'
-            global-settings-type: cfp
-
-        - shell:
-            !include-raw-escape:
-                - include-raw-cleanup-docker.sh
+            stream: '{stream}'
+            OVS_VERSION: '2.5.0'
         - jacoco-nojava-workaround
 
     publishers: