X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=jjb%2Fneutron%2Fneutron-daily-openstack-beryllium.yaml;h=52282f9f3479fd5475e9a1c954c2f9139c407c71;hb=8f09a881eae993f36bb4fa193523cf401ebb9a01;hp=8ff295cd5c4847a520e47e9efe2f0e832220a989;hpb=06d18fa9e021ebda478047949b12e53b5358433d;p=releng%2Fbuilder.git

diff --git a/jjb/neutron/neutron-daily-openstack-beryllium.yaml b/jjb/neutron/neutron-daily-openstack-beryllium.yaml
index 8ff295cd5..52282f9f3 100644
--- a/jjb/neutron/neutron-daily-openstack-beryllium.yaml
+++ b/jjb/neutron/neutron-daily-openstack-beryllium.yaml
@@ -1,8 +1,9 @@
+---
 - project:
     name: neutron-daily-openstack
     jobs:
-        # TODO: Do we want boron job too?
-        - 'neutron-daily-openstack-beryllium'
+      # TODO: Do we want boron job too?
+      - 'neutron-daily-openstack-beryllium'
 
     project: 'neutron'
 
@@ -10,49 +11,48 @@
     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:
-            project: '{project}'
+      - opendaylight-infra-parameters:
+          os-cloud: '{os-cloud}'
+          project: '{project}'
+          branch: '{branch}'
+          refspec: 'refs/heads/{branch}'
+          artifacts: '{archive-artifacts}'
 
     wrappers:
-        - timeout:
-            fail: true
-            timeout: 90
-            timeout-var: 'BUILD_TIMEOUT'
-            type: absolute
-        - ssh-agent-credentials:
-            users:
-                - '{openstack-gerrit-credentials}'
-        - jclouds:
-            single-use: true
+      - opendaylight-infra-wrappers:
+          build-timeout: '90'
+      - ssh-agent-credentials:
+          users:
+            - 'openstack-gerrit-ssh'
 
     triggers:
-        - timed: '@daily'
+      - timed: '@daily'
 
     builders:
-        - inject:
-            properties-content: |
-              ODL_VERSION=lithium-latest
-              TEMPEST_REGEX=tempest.api.network
-              KARAFFEATURE=odl-neutron-dummyprovider-test
-        - shell:
-            !include-raw-escape:
-                - include-raw-openstack-ci.sh
+      - 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
+      - shell: !include-raw-escape: include-raw-openstack-ci.sh
 
     publishers:
-        - archive:
-            artifacts: 'logs/**'
-            fingerprint: false
-        - email-ext:
-            subject: '[neutron] $DEFAULT_SUBJECT'
-            attach-build-log: false
-            failure: false
-            unstable: false
-            fixed: false
+      - archive:
+          artifacts: 'logs/**'
+          fingerprint: false
+      - email-ext:
+          subject: '[neutron] $DEFAULT_SUBJECT'
+          attach-build-log: false
+          failure: false
+          unstable: false
+          fixed: false