Add netvirt vpnservice IT tests

Add netvirt vpnservice IT test target to
netvirt-daily-integration job.

Install docker-compose using virtualenv.

Pass cli flag, -Ddocker.vEnvWs=$WORKSPACE, so that
DockerOvs() will be able to find docker-compose
that is installed in the virtual environment,
$WORKSPACE/venv/bin/docker-compose.

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

diff --git a/jjb/netvirt/netvirt-full-integration.yaml b/jjb/netvirt/netvirt-full-integration.yaml
index 64cc0f3ca8f35210a0a2b59803ab3fef71b7de67..a5c7096fb2a380d4d0cff8c94934d2f82909824e 100644 (file)
--- a/jjb/netvirt/netvirt-full-integration.yaml
+++ b/jjb/netvirt/netvirt-full-integration.yaml
@@ -64,11 +64,51 @@
             pomFile: 'openstack/net-virt-sfc/it/pom.xml'
             logfile: '{OVS_VERSION}-netvirt-sfc-IT.log'
 
+- builder:
+    name: install-docker-compose
+    builders:
+        - shell: |
+            virtualenv $WORKSPACE/venv
+            source $WORKSPACE/venv/bin/activate
+            pip install --upgrade pip
+            pip install docker-compose
+
+- builder:
+    name: deactivate-docker-compose
+    builders:
+        - shell: |
+            $WORKSPACE/venv/bin/deactivate
+
+- builder:
+    name: run-netvirt-vpnservice-it
+    builders:
+        - install-docker-compose
+        - maven-target:
+            maven-version: '{maven-version}'
+            pom: 'vpnservice/it/pom.xml'
+            goals: '-V -B verify -l {OVS_VERSION}-netvirt-vpnservice-IT.log -Pintegrationtest -Dskip.karaf.featureTest=true -Dmaven.compile.fork=true -Dovsdb.controller.address=${{CONTROLLER_IP}} -Ddocker.compose.file=ovs-{OVS_VERSION}-hwvtep.yml -Ddocker.vEnvWs=$WORKSPACE'
+            properties:
+                - '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
+        - deactivate-docker-compose
+
 - builder:
     name: run-netvirt-it
     builders:
         - inject:
             properties-content: OVS_VERSION={OVS_VERSION}
+        - run-netvirt-vpnservice-it:
+            OVS_VERSION: '{OVS_VERSION}'
+            maven-version: '{maven-version}'
+            stream: '{stream}'
         - shell:
             !include-raw-escape:
                 - include-raw-setup-docker.sh