Merge "Migrate docs-rtd to archive-builds macro"

[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 673a07530a854192130a02456fe7a6b22c70bcb9..127c900255539542703bb0862aeb79e5ae58e422 100644 (file)
--- a/jjb/neutron/neutron-daily-openstack-beryllium.yaml
+++ b/jjb/neutron/neutron-daily-openstack-beryllium.yaml
@@ -1,6 +1,7 @@
 - project:
     name: neutron-daily-openstack
     jobs:
+        # TODO: Do we want boron job too?
         - 'neutron-daily-openstack-beryllium'
 
     project: 'neutron'
@@ -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}'
-        - jclouds:
-            single-use: true
+                - 'openstack-gerrit-ssh'
 
     triggers:
         - timed: '@daily'
@@ -42,7 +41,8 @@
               TEMPEST_REGEX=tempest.api.network
               KARAFFEATURE=odl-neutron-dummyprovider-test
         - shell:
-            !include-raw-escape include-raw-openstack-ci.sh
+            !include-raw-escape:
+                - include-raw-openstack-ci.sh
 
     publishers:
         - archive: