Rename archive-build macro to opendaylight-infra-shiplogs

[releng/builder.git] / jjb / netvirt / netvirt-openstack.yaml

diff --git a/jjb/netvirt/netvirt-openstack.yaml b/jjb/netvirt/netvirt-openstack.yaml
index 512be70e1e472978cd40acaad3a69dc61dde6203..c913c6eca5eb41e4d91f21e7b62bec48b9fbbb34 100644 (file)
--- a/jjb/netvirt/netvirt-openstack.yaml
+++ b/jjb/netvirt/netvirt-openstack.yaml
@@ -4,12 +4,13 @@
         - 'netvirt-openstack-gerrit'
 
     project: 'netvirt'
+    archive-artifacts: 'logs/**'
 
 - job-template:
     name: 'netvirt-openstack-gerrit'
 
     project-type: freestyle
-    node: dynamic_devstack
+    node: centos7-devstack-2c-4g
     description: 'Jenkins job to run Tempest tests for the OpenDaylight ML2 MechanismDriver. '
     concurrent: true
 
@@ -17,20 +18,18 @@
         daysToKeep: '198'
 
     parameters:
-        - project-parameter:
+        - opendaylight-infra-parameters:
             project: '{project}'
+            branch: '{branch}'
+            refspec: 'refs/heads/{branch}'
+            artifacts: '{archive-artifacts}'
 
     wrappers:
-        - timeout:
-            fail: true
-            timeout: 90
-            timeout-var: 'BUILD_TIMEOUT'
-            type: absolute
+        - opendaylight-infra-wrappers:
+            build-timeout: '90'
         - ssh-agent-credentials:
             users:
-                - '{openstack-gerrit-credentials}'
-        - openstack:
-            single-use: true
+                - 'openstack-gerrit-ssh'
 
     triggers:
         - gerrit:
@@ -79,12 +78,11 @@
                 - include-raw-openstack-ci.sh
 
     publishers:
-        - archive:
-            artifacts: 'logs/**'
-            fingerprint: false
         - email-ext:
             subject: '[netvirt] $DEFAULT_SUBJECT'
             attach-build-log: false
             failure: true
             unstable: true
             fixed: true
+        - opendaylight-infra-shiplogs:
+            maven-version: '{mvn33}'