Split Netvirt IT into separate targets

This patch splits Netvirt IT into separate targets, as
was done for OVSDB IT in patch:
https://git.opendaylight.org/gerrit/#/c/42483/

The targets for Netvirt IT are:

1. build netvirt
2. net-virt-it
3. net-virt-sfc-it

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

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

diff --git a/jjb/netvirt/include-raw-setup-docker.sh b/jjb/netvirt/include-raw-setup-docker.sh
index 2191c52aba2835cb70c64f3f237c331b49897f1d..c3ffa0fe68e02c500b70812b4710b6459ffde7b6 100644 (file)
--- a/jjb/netvirt/include-raw-setup-docker.sh
+++ b/jjb/netvirt/include-raw-setup-docker.sh
@@ -22,10 +22,6 @@ echo "---> Starting OVS $OVS_VERSION"
 /usr/bin/docker pull vpickard/openvswitch:$OVS_VERSION
 CID=$(/usr/bin/docker run -p 6641:6640 --privileged=true -d -i -t vpickard/openvswitch:$OVS_VERSION /usr/bin/supervisord)
 REALCID=`echo $CID | rev | cut -d ' ' -f 1 | rev`
-echo "---> Waiting to start OVS HW VTEP Emulator"
-sleep 5
-echo "---> Starting OVS HW VTEP Emulator"
-/usr/bin/docker exec $REALCID supervisorctl start ovs-vtep
 echo "CID=$REALCID" > env.properties
 echo "OVS_VERSION=${OVS_VERSION}" >> env.properties
 CONTROLLER_IP=`facter ipaddress`

diff --git a/jjb/netvirt/include-setup-hwvtep-docker.sh b/jjb/netvirt/include-setup-hwvtep-docker.sh
new file mode 100644 (file)
index 0000000..ed0f9c4
--- /dev/null
+++ b/jjb/netvirt/include-setup-hwvtep-docker.sh
@@ -0,0 +1,17 @@
+#!/bin/bash
+
+set -e
+
+echo "---> Configuring OVS for HW VTEP Emulator"
+/usr/bin/docker exec $CID supervisorctl stop ovsdb-server
+/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
+/usr/bin/docker exec $CID vtep-ctl add-ps br-vtep
+/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 5

diff --git a/jjb/netvirt/netvirt-full-integration.yaml b/jjb/netvirt/netvirt-full-integration.yaml
index d50617f543237658c0e667d3eb5649b12a86cb35..f79bb7b06388ca8591c2982af362b28927a4fe2e 100644 (file)
--- a/jjb/netvirt/netvirt-full-integration.yaml
+++ b/jjb/netvirt/netvirt-full-integration.yaml
@@ -18,7 +18,68 @@
                 - openjdk8
 
     project: 'netvirt'
-    archive-artifacts: 'docker-ovs-*.log'
+    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: 'netvirt-settings'
+            settings-type: cfp
+            global-settings: 'odl-global-settings'
+            global-settings-type: cfp
+
+- builder:
+    name: run-net-virt-it
+    builders:
+        - run-it:
+            maven-version: '{maven-version}'
+            stream: '{stream}'
+            pomFile: 'openstack/net-virt-it/pom.xml'
+            logfile: '{OVS_VERSION}-net-virt-IT.log'
+
+- builder:
+    name: run-netvirt-sfc-it
+    builders:
+        - run-it:
+            maven-version: '{maven-version}'
+            stream: '{stream}'
+            pomFile: 'openstack/net-virt-sfc/it/pom.xml'
+            logfile: '{OVS_VERSION}-netvirt-sfc-IT.log'
+
+- builder:
+    name: run-netvirt-it
+    builders:
+        - inject:
+            properties-content: OVS_VERSION={OVS_VERSION}
+        - shell:
+            !include-raw-escape:
+                - include-raw-setup-docker.sh
+        - inject:
+            properties-file: env.properties
+        - run-net-virt-it:
+            OVS_VERSION: '{OVS_VERSION}'
+            maven-version: '{maven-version}'
+            stream: '{stream}'
+        - run-netvirt-sfc-it:
+            OVS_VERSION: '{OVS_VERSION}'
+            maven-version: '{maven-version}'
+            stream: '{stream}'
+        - shell:
+            !include-raw-escape:
+                - include-raw-cleanup-docker.sh
 
 - job-template:
     name: 'netvirt-daily-full-integration-{stream}'
@@ -27,29 +88,10 @@
     #     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 netvirt 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
+    project-type: freestyle
+    node: centos7-docker-2c-4g
+    jdk: '{jdk}'
+    description: 'Integration tests for the Netvirt project against different versions of OVS and branches. This job runs nightly. '
 
     logrotate:
         daysToKeep: '{build-days-to-keep}'
@@ -95,19 +137,11 @@
 
     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'
-            goals: 'clean install dependency:tree -V -B verify -Pintegrationtest -Dskip.karaf.featureTest=true -Dmaven.compile.fork=true -Dovsdb.controller.address=${{CONTROLLER_IP}}'
+            goals: '-V -B -l build.log clean install dependency:tree -Pq -Dmaven.compile.fork=true'
             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}'
@@ -117,9 +151,14 @@
             settings-type: cfp
             global-settings: 'odl-global-settings'
             global-settings-type: cfp
-        - shell:
-            !include-raw-escape:
-                - include-raw-cleanup-docker.sh
+        - run-netvirt-it:
+            maven-version: '{mvn33}'
+            stream: '{stream}'
+            OVS_VERSION: '2.4.0'
+        - run-netvirt-it:
+            maven-version: '{mvn33}'
+            stream: '{stream}'
+            OVS_VERSION: '2.5.0'
         - jacoco-nojava-workaround
 
     publishers: