X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=jjb%2Fovsdb%2Fovsdb-full-integration.yaml;h=bf85ee7e1e5cbf4ed18f1bbc0fcb7013b24bec56;hb=df0f32f924e9a71436df812ae5f446e32c6e717f;hp=964df38dd258efea6c93ccd61ec2def6b2c0f81d;hpb=21ba55a182b3f538bff2c084a01c490a2517f848;p=releng%2Fbuilder.git

diff --git a/jjb/ovsdb/ovsdb-full-integration.yaml b/jjb/ovsdb/ovsdb-full-integration.yaml
index 964df38dd..bf85ee7e1 100644
--- a/jjb/ovsdb/ovsdb-full-integration.yaml
+++ b/jjb/ovsdb/ovsdb-full-integration.yaml
@@ -23,6 +23,7 @@
                 - openjdk7
 
     project: 'ovsdb'
+    archive-artifacts: '*.log'
 
 - job-template:
     name: 'ovsdb-daily-full-integration-{stream}'
@@ -42,8 +43,9 @@
             type: user-defined
             name: 'OVS_VERSION'
             values:
-                - 2.3.2
+                - 2.3.3
                 - 2.4.0
+                - 2.5.0
         - axis:
             type: jdk
             values: '{obj:jdks}'
@@ -52,7 +54,7 @@
             type: slave
             name: nodes
             values:
-                - dynamic_docker
+                - centos7-docker-2c-4g
 
     logrotate:
         daysToKeep: '{build-days-to-keep}'
@@ -61,31 +63,40 @@
         artifactNumToKeep: '{build-artifact-num-to-keep}'
 
     parameters:
-        - project-parameter:
-            project: '{project}'
-        - gerrit-parameters:
+        - opendaylight-infra-parameters:
             project: '{project}'
             branch: '{branch}'
             refspec: 'refs/heads/{branch}'
+            artifacts: '{archive-artifacts}'
 
     scm:
-        - git-scm:
-            credentials-id: '{ssh-credentials}'
-            refspec: ''
+        - gerrit-trigger-scm:
+            refspec: '$GERRIT_REFSPEC'
             branch: '{branch}'
+            choosing-strategy: gerrit
 
     wrappers:
-        - timeout:
-            fail: true
-            timeout: 360
-            timeout-var: 'BUILD_TIMEOUT'
-            type: absolute
-        - ssh-agent-credentials:
-            users:
-                - '{ssh-credentials}'
+        - opendaylight-infra-wrappers:
+            build-timeout: '{build-timeout}'
 
     triggers:
         - timed: '@midnight'
+        - gerrit:
+            server-name: 'OpenDaylight'
+            trigger-on:
+              - comment-added-contains-event:
+                 comment-contains-value: 'runit'
+            projects:
+              - project-compare-type: 'ANT'
+                project-pattern: '{project}'
+                branches:
+                  - branch-compare-type: 'ANT'
+                    branch-pattern: '**/{branch}'
+            skip-vote:
+                successful: true
+                failed: true
+                unstable: true
+                notbuilt: true
 
     builders:
         - wipe-org-opendaylight-repo
@@ -97,7 +108,21 @@
         - maven-target:
             maven-version: '{mvn33}'
             pom: 'pom.xml'
-            goals: 'clean install -V 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:
+                - '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: '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'
@@ -107,16 +132,55 @@
                 - 'stream={stream}'
             java-opts:
                 - '-Xmx1024m -XX:MaxPermSize=256m'
-            settings: '{ovsdb-settings}'
-            global-settings: '{odl-global-settings}'
+            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
         - jacoco-nojava-workaround
 
     publishers:
-        - archive:
-            artifacts: 'docker-ovs-*.log'
-            fingerprint: false
         - email-notification:
             email-prefix: '[ovsdb]'
+        - archive-build:
+            maven-version: '{mvn33}'