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

[releng/builder.git] / jjb / autorelease / autorelease-templates.yaml

diff --git a/jjb/autorelease/autorelease-templates.yaml b/jjb/autorelease/autorelease-templates.yaml
index 5f2da254e701aa2f4ffcd68efd9660fc91de9e3a..e31cfc311eec7267a0fa8307291bf99e1d38407a 100644 (file)
--- a/jjb/autorelease/autorelease-templates.yaml
+++ b/jjb/autorelease/autorelease-templates.yaml
@@ -12,8 +12,11 @@
         artifactDaysToKeep: '14'
 
     parameters:
-        - project-parameter:
+        - opendaylight-infra-parameters:
             project: '{project}'
+            branch: '{branch}'
+            refspec: 'refs/heads/{branch}'
+            artifacts: '{archive-artifacts}'
         - autorelease-release-tag:
             release-tag: '{next-release-tag}'
         - autorelease-release-branch:
@@ -21,7 +24,7 @@
 
     scm:
         - git:
-            credentials-id: '{ssh-credentials}'
+            credentials-id: 'opendaylight-jenkins-ssh'
             url: '$GIT_BASE'
             refspec: ''
             branches:
@@ -32,10 +35,8 @@
                 timeout: 60
 
     wrappers:
-        - autorelease-build-timeout
-        - ssh-agent-credentials:
-            users:
-                - '{ssh-credentials}'
+        - opendaylight-infra-wrappers:
+            build-timeout: '1440'
 
     triggers:
         - timed: 'H 0 * * *'
@@ -97,8 +98,11 @@
         artifactNumToKeep: '{build-artifact-num-to-keep}'
 
     parameters:
-        - project-parameter:
+        - opendaylight-infra-parameters:
             project: '{project}'
+            branch: '{branch}'
+            refspec: 'refs/heads/{branch}'
+            artifacts: '{archive-artifacts}'
         - string:
             name: REPORT_DIR
             default: '$WORKSPACE/project-reports'
@@ -106,7 +110,7 @@
 
     scm:
         - git:
-            credentials-id: '{ssh-credentials}'
+            credentials-id: 'opendaylight-jenkins-ssh'
             url: '$GIT_BASE'
             refspec: ''
             branches:
@@ -116,13 +120,8 @@
                 recursive: true
 
     wrappers:
-        - timeout:
-            type: absolute
-            timeout: 30
-            fail: true
-        - ssh-agent-credentials:
-            users:
-                - '{ssh-credentials}'
+        - opendaylight-infra-wrappers:
+            build-timeout: '30'
 
     triggers:
         - timed: '0 0 * * 0'
@@ -173,23 +172,20 @@
         artifactNumToKeep: -1
 
     parameters:
-    - project-parameter:
-        project: '{project}'
-    - gerrit-parameters:
-        project: '{project}'
-        branch: '{branch}'
-        refspec: 'refs/heads/{branch}'
+        - opendaylight-infra-parameters:
+            project: '{project}'
+            branch: '{branch}'
+            refspec: 'refs/heads/{branch}'
+            artifacts: '{archive-artifacts}'
 
     scm:
     - gerrit-trigger-scm:
-        credentials-id: '{ssh-credentials}'
         refspec: ''
         choosing-strategy: 'default'
 
     wrappers:
-    - ssh-agent-credentials:
-        users:
-        - '{ssh-credentials}'
+        - opendaylight-infra-wrappers:
+            build-timeout: '{build-timeout}'
 
     triggers:
     - autorelease-trigger-patch-site-merged:
@@ -227,23 +223,20 @@
         artifactNumToKeep: -1
 
     parameters:
-    - project-parameter:
-        project: '{project}'
-    - gerrit-parameters:
-        project: '{project}'
-        branch: '{branch}'
-        refspec: 'refs/heads/{branch}'
+        - opendaylight-infra-parameters:
+            project: '{project}'
+            branch: '{branch}'
+            refspec: 'refs/heads/{branch}'
+            artifacts: '{archive-artifacts}'
 
     scm:
     - gerrit-trigger-scm:
-        credentials-id: '{ssh-credentials}'
         refspec: '$GERRIT_REFSPEC'
         choosing-strategy: 'gerrit'
 
     wrappers:
-    - ssh-agent-credentials:
-        users:
-        - '{ssh-credentials}'
+        - opendaylight-infra-wrappers:
+            build-timeout: '{build-timeout}'
 
     triggers:
     - autorelease-trigger-patch-site-submitted: