refactor email recipients to parameter with default value

[releng/builder.git] / jjb / netvirt / netvirt-full-integration.yaml

diff --git a/jjb/netvirt/netvirt-full-integration.yaml b/jjb/netvirt/netvirt-full-integration.yaml
index 64cc0f3ca8f35210a0a2b59803ab3fef71b7de67..3b7760beb1874f52f46cd9083cb7c8c296904ea9 100644 (file)
--- a/jjb/netvirt/netvirt-full-integration.yaml
+++ b/jjb/netvirt/netvirt-full-integration.yaml
@@ -3,8 +3,6 @@
     jobs:
         - 'netvirt-daily-full-integration-{stream}'
 
-    # stream:    release stream (eg. stable-lithium or beryllium)
-    # branch:    git branch (eg. stable/lithium or master)
     stream:
         - carbon:
             branch: 'master'
@@ -23,15 +21,15 @@
                 - openjdk8
 
     project: 'netvirt'
-    archive-artifacts: '*.log'
+    archive-artifacts: '*.log **/target/surefire-reports/*.txt'
 
 - builder:
-    name: netvirt-run-it
+    name: netvirt-run-it-external-docker
     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}}'
+            goals: '-V -B verify -l {logfile} -Pintegrationtest -Dskip.karaf.featureTest=true -Dmaven.compile.fork=true -Dovsdb.controller.address=${{CONTROLLER_IP}} -Dmaven.test.failure.ignore=true'
             properties:
                 - 'ovsdbserver.ipaddress=127.0.0.1'
                 - 'ovsdbserver.port=6641'
@@ -46,24 +44,63 @@
             global-settings: 'odl-global-settings'
             global-settings-type: cfp
 
+- builder:
+    name: netvirt-run-it-dockerOvs
+    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}} -Ddocker.compose.file=ovs-{OVS_VERSION}-hwvtep.yml -Ddocker.vEnvWs=$WORKSPACE -Dsgm=transparent -Dmaven.test.failure.ignore=true'
+            properties:
+                - '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:
-        - netvirt-run-it:
+        - netvirt-run-it-dockerOvs:
             maven-version: '{maven-version}'
             stream: '{stream}'
             pomFile: 'openstack/net-virt-it/pom.xml'
             logfile: '{OVS_VERSION}-net-virt-IT.log'
+            OVS_VERSION: '{OVS_VERSION}'
 
 - builder:
     name: run-netvirt-sfc-it
     builders:
-        - netvirt-run-it:
+        - netvirt-run-it-external-docker:
             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-vpnservice-it
+    builders:
+        - netvirt-run-it-dockerOvs:
+            maven-version: '{maven-version}'
+            stream: '{stream}'
+            pomFile: 'vpnservice/it/pom.xml'
+            logfile: '{OVS_VERSION}-netvirt-vpnservice-IT.log'
+            OVS_VERSION: '{OVS_VERSION}'
+
+- 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: run-netvirt-it
     builders:
@@ -71,13 +108,23 @@
             properties-content: OVS_VERSION={OVS_VERSION}
         - shell:
             !include-raw-escape:
-                - include-raw-setup-docker.sh
+                - include-setup-misc.sh
         - inject:
             properties-file: env.properties
+        - install-docker-compose
+        - run-netvirt-vpnservice-it:
+            OVS_VERSION: '{OVS_VERSION}'
+            maven-version: '{maven-version}'
+            stream: '{stream}'
         - run-net-virt-it:
             OVS_VERSION: '{OVS_VERSION}'
             maven-version: '{maven-version}'
             stream: '{stream}'
+        - shell:
+            !include-raw-escape:
+                - include-raw-setup-docker.sh
+        - inject:
+            properties-file: env.properties
         - run-netvirt-sfc-it:
             OVS_VERSION: '{OVS_VERSION}'
             maven-version: '{maven-version}'
@@ -89,10 +136,6 @@
 - job-template:
     name: 'netvirt-daily-full-integration-{stream}'
 
-    # Required Variables:
-    #     stream:    release stream (eg. stable-lithium or beryllium)
-    #     branch:    git branch (eg. stable/lithium or master)
-
     project-type: freestyle
     node: centos7-docker-2c-4g
     jdk: '{jdk}'
@@ -143,7 +186,7 @@
     builders:
         - wipe-org-opendaylight-repo
         - maven-target:
-            maven-version: '{mvn33}'
+            maven-version: 'mvn33'
             pom: 'pom.xml'
             goals: '-V -B -l build.log clean install dependency:tree -Pq -Dmaven.compile.fork=true'
             properties:
@@ -156,18 +199,26 @@
             settings-type: cfp
             global-settings: 'odl-global-settings'
             global-settings-type: cfp
+        #  skip 2.4.0 until we figure out conntrack
+        #- run-netvirt-it:
+        #    maven-version: 'mvn33'
+        #    stream: '{stream}'
+        #    OVS_VERSION: '2.4.0'
         - run-netvirt-it:
-            maven-version: '{mvn33}'
-            stream: '{stream}'
-            OVS_VERSION: '2.4.0'
-        - run-netvirt-it:
-            maven-version: '{mvn33}'
+            maven-version: 'mvn33'
             stream: '{stream}'
             OVS_VERSION: '2.5.0'
         - jacoco-nojava-workaround
 
     publishers:
         - email-notification:
+            email-recipients: '{email-recipients}'
             email-prefix: '[netvirt]'
-        - archive-build:
-            maven-version: '{mvn33}'
+        - text-finder:
+            fileset: "**/target/surefire-reports/*.xml"
+            regexp: 'failures\=\"[^0]\"'
+            succeed-if-found: false
+            unstable-if-found: true
+            also-check-console-output: false
+        - opendaylight-infra-shiplogs:
+            maven-version: 'mvn33'