X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=jjb%2Fovsdb%2Fovsdb-full-integration.yaml;h=39f3e92320c429c7dc21e7e9fad6b5a288bbd1b6;hb=dae67a1f93f7ebe956750d65c10ae9e881c3e10d;hp=bf85ee7e1e5cbf4ed18f1bbc0fcb7013b24bec56;hpb=a214d88a9c46b5647f624ff6b3ef60d03d16567a;p=releng%2Fbuilder.git

diff --git a/jjb/ovsdb/ovsdb-full-integration.yaml b/jjb/ovsdb/ovsdb-full-integration.yaml
index bf85ee7e1..39f3e9232 100644
--- a/jjb/ovsdb/ovsdb-full-integration.yaml
+++ b/jjb/ovsdb/ovsdb-full-integration.yaml
@@ -3,58 +3,110 @@
     jobs:
         - 'ovsdb-daily-full-integration-{stream}'
 
-    # 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
             jdks:
                 - openjdk8
-        - stable-lithium:
-            branch: 'stable/lithium'
-            jdk: openjdk7
-            jdks:
-                - openjdk7
 
     project: 'ovsdb'
     archive-artifacts: '*.log'
 
+- builder:
+    name: ovsdb-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:
+        - ovsdb-run-it:
+            maven-version: '{maven-version}'
+            stream: '{stream}'
+            pomFile: 'library/it/pom.xml'
+            logfile: '{OVS_VERSION}-libraryIT.log'
+
+- builder:
+    name: run-southbound-it
+    builders:
+        - ovsdb-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:
+        - ovsdb-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}'
 
-    # Required Variables:
-    #     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,13 +152,8 @@
 
     builders:
         - wipe-org-opendaylight-repo
-        - shell:
-            !include-raw-escape:
-                - include-raw-setup-docker.sh
-        - inject:
-            properties-file: env.properties
         - 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:
@@ -119,68 +166,18 @@
             settings-type: cfp
             global-settings: 'odl-global-settings'
             global-settings-type: cfp
-        - maven-target:
-            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:
-            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
+        - run-ovsdb-it:
+            maven-version: 'mvn33'
+            stream: '{stream}'
+            OVS_VERSION: '2.4.0'
+        - run-ovsdb-it:
+            maven-version: 'mvn33'
+            stream: '{stream}'
+            OVS_VERSION: '2.5.0'
         - jacoco-nojava-workaround
 
     publishers:
         - email-notification:
             email-prefix: '[ovsdb]'
-        - archive-build:
-            maven-version: '{mvn33}'
+        - opendaylight-infra-shiplogs:
+            maven-version: 'mvn33'