X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=jjb%2Fnetvirt%2Fnetvirt-full-integration.yaml;h=10fd4fdaf440a1e3fe270456b0b277374762e298;hb=11dd881c89a4edba243b87df488710105c81d171;hp=d50617f543237658c0e667d3eb5649b12a86cb35;hpb=0bce2deec8afba3f0761959487c8d7d7773daa7b;p=releng%2Fbuilder.git

diff --git a/jjb/netvirt/netvirt-full-integration.yaml b/jjb/netvirt/netvirt-full-integration.yaml
index d50617f54..10fd4fdaf 100644
--- a/jjb/netvirt/netvirt-full-integration.yaml
+++ b/jjb/netvirt/netvirt-full-integration.yaml
@@ -6,11 +6,16 @@
     # stream:    release stream (eg. stable-lithium or beryllium)
     # branch:    git branch (eg. stable/lithium or master)
     stream:
-        - boron:
+        - carbon:
             branch: 'master'
             jdk: openjdk8
             jdks:
                 - openjdk8
+        - boron:
+            branch: 'stable/boron'
+            jdk: openjdk8
+            jdks:
+                - openjdk8
         - beryllium:
             branch: 'stable/beryllium'
             jdk: openjdk8
@@ -18,7 +23,118 @@
                 - openjdk8
 
     project: 'netvirt'
-    archive-artifacts: 'docker-ovs-*.log'
+    archive-artifacts: '*.log **/target/surefire-reports/*.txt'
+
+- builder:
+    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}} -Dmaven.test.failure.ignore=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}'
+            java-opts:
+                - '-Xmx1024m -XX:MaxPermSize=256m'
+            settings: 'netvirt-settings'
+            settings-type: cfp
+            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:
+                - '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:
+        - 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-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:
+        - inject:
+            properties-content: OVS_VERSION={OVS_VERSION}
+        - shell:
+            !include-raw-escape:
+                - include-setup-controllerIp.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}'
+            stream: '{stream}'
+        - shell:
+            !include-raw-escape:
+                - include-raw-cleanup-docker.sh
 
 - job-template:
     name: 'netvirt-daily-full-integration-{stream}'
@@ -27,29 +143,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 +192,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,13 +206,25 @@
             settings-type: cfp
             global-settings: 'odl-global-settings'
             global-settings-type: cfp
-        - shell:
-            !include-raw-escape:
-                - include-raw-cleanup-docker.sh
+        #  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.5.0'
         - jacoco-nojava-workaround
 
     publishers:
         - email-notification:
             email-prefix: '[netvirt]'
-        - archive-build:
+        - 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}'