Merge "Migrate faas matrix-verify jobs to freestyle-verify jobs"

[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 31d74776c4ea6f52c102a43c67ec49070e2ac48a..d50617f543237658c0e667d3eb5649b12a86cb35 100644 (file)
--- a/jjb/netvirt/netvirt-full-integration.yaml
+++ b/jjb/netvirt/netvirt-full-integration.yaml
@@ -18,6 +18,7 @@
                 - openjdk8
 
     project: 'netvirt'
+    archive-artifacts: 'docker-ovs-*.log'
 
 - job-template:
     name: 'netvirt-daily-full-integration-{stream}'
@@ -37,8 +38,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}'
@@ -47,7 +49,7 @@
             type: slave
             name: nodes
             values:
-                - dynamic_docker
+                - centos7-docker-2c-4g
 
     logrotate:
         daysToKeep: '{build-days-to-keep}'
@@ -56,12 +58,11 @@
         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:
         - gerrit-trigger-scm:
@@ -102,7 +103,7 @@
         - 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: 'clean install dependency:tree -V -B verify -Pintegrationtest -Dskip.karaf.featureTest=true -Dmaven.compile.fork=true -Dovsdb.controller.address=${{CONTROLLER_IP}}'
             properties:
                 - 'ovsdbserver.ipaddress=127.0.0.1'
                 - 'ovsdbserver.port=6641'
@@ -122,8 +123,7 @@
         - jacoco-nojava-workaround
 
     publishers:
-        - archive:
-            artifacts: 'docker-ovs-*.log'
-            fingerprint: false
         - email-notification:
             email-prefix: '[netvirt]'
+        - archive-build:
+            maven-version: '{mvn33}'