Merge "Remove jjb custom scripting"

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

diff --git a/jjb/autorelease/autorelease-templates.yaml b/jjb/autorelease/autorelease-templates.yaml
index ec0bbeea44dbee9db0edfc45e25908a396adabd6..8485cb07efdcff86d7937d996cb3da6e92cd2607 100644 (file)
--- a/jjb/autorelease/autorelease-templates.yaml
+++ b/jjb/autorelease/autorelease-templates.yaml
@@ -4,7 +4,7 @@
     name: 'autorelease-release-{stream}'
 
     project-type: maven
-    node: dynamic_autorelease
+    node: centos7-autorelease-4c-16g
     jdk: '{jdk}'
 
     logrotate:
@@ -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:
@@ -86,7 +89,7 @@
     name: 'autorelease-project-report-{stream}'
 
     project-type: freestyle
-    node: dynamic_verify
+    node: centos7-java-builder-2c-8g
 
     logrotate:
         daysToKeep: '{build-days-to-keep}'
@@ -95,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'
@@ -151,7 +157,7 @@
 
 - job-template:
     name: 'autorelease-site-publish-{stream}'
-    node: dynamic_merge
+    node: centos7-java-builder-2c-8g
     concurrent: false
     jdk: 'openjdk8'
 
@@ -166,12 +172,11 @@
         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:
@@ -203,7 +208,7 @@
 
 - job-template:
     name: 'autorelease-site-verify-{stream}'
-    node: dynamic_verify
+    node: centos7-java-builder-2c-8g
     concurrent: true
     jdk: 'openjdk8'
 
@@ -218,12 +223,11 @@
         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: