Merge "Migrate aaa 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 5c376abad3a66617fe39bdbd2218fdc108a40942..a883b2ca6b693dea46e23e657ab1b6a4203d31a7 100644 (file)
--- a/jjb/netvirt/netvirt-full-integration.yaml
+++ b/jjb/netvirt/netvirt-full-integration.yaml
@@ -37,8 +37,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 +48,7 @@
             type: slave
             name: nodes
             values:
-                - dynamic_docker
+                - centos7-docker-2c-4g
 
     logrotate:
         daysToKeep: '{build-days-to-keep}'
@@ -56,29 +57,21 @@
         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:
-            credentials-id: '{ssh-credentials}'
             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'
@@ -109,7 +102,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'