Merge "refactor ovsdb patch test and add ability to trigger netvirt csit"

[releng/builder.git] / jjb / neutron / neutron-daily-openstack-beryllium.yaml

diff --git a/jjb/neutron/neutron-daily-openstack-beryllium.yaml b/jjb/neutron/neutron-daily-openstack-beryllium.yaml
index 8ff295cd5c4847a520e47e9efe2f0e832220a989..e29e017053cf3d96eeeff7aec39bf5924bb1717f 100644 (file)
--- a/jjb/neutron/neutron-daily-openstack-beryllium.yaml
+++ b/jjb/neutron/neutron-daily-openstack-beryllium.yaml
@@ -10,28 +10,27 @@
     name: 'neutron-daily-openstack-beryllium'
 
     project-type: freestyle
-    node: dynamic_devstack
+    node: centos7-devstack-2c-4g
     description: 'Jenkins job to run Tempest tests for the ODL ML2 MechanismDriver on Neutron dummy provider. '
     concurrent: true
 
-    logrotate:
-        daysToKeep: '198'
+    properties:
+        - opendaylight-infra-properties:
+            build-days-to-keep: '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}'
-        - jclouds:
-            single-use: true
+                - 'openstack-gerrit-ssh'
 
     triggers:
         - timed: '@daily'
@@ -39,6 +38,7 @@
     builders:
         - inject:
             properties-content: |
+              # FIXME: Should *-beryllium job set lithium version? Add a comment why.
               ODL_VERSION=lithium-latest
               TEMPEST_REGEX=tempest.api.network
               KARAFFEATURE=odl-neutron-dummyprovider-test