Merge "Migrate csit templates to lf-infra-publish"

[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 127c900255539542703bb0862aeb79e5ae58e422..52282f9f3479fd5475e9a1c954c2f9139c407c71 100644 (file)
--- 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,47 +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:
-        - opendaylight-infra-parameters:
-            project: '{project}'
-            branch: '{branch}'
-            refspec: 'refs/heads/{branch}'
-            artifacts: '{archive-artifacts}'
+      - opendaylight-infra-parameters:
+          os-cloud: '{os-cloud}'
+          project: '{project}'
+          branch: '{branch}'
+          refspec: 'refs/heads/{branch}'
+          artifacts: '{archive-artifacts}'
 
     wrappers:
-        - opendaylight-infra-wrappers:
-            build-timeout: '90'
-        - ssh-agent-credentials:
-            users:
-                - 'openstack-gerrit-ssh'
+      - 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