X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=jjb%2Freleng-templates.yaml;h=ed4f704452e77d78a47dfab2bb510a19fdbcaa64;hb=b27305cd0117d79ef33d80cbf6ee180a23b2a375;hp=c008bf02d5ab7942de27465cdaf17520c6c67140;hpb=4bf75570c21ec0899d3ed71e0077ed7bee3679f8;p=releng%2Fbuilder.git

diff --git a/jjb/releng-templates.yaml b/jjb/releng-templates.yaml
index c008bf02d..ed4f70445 100644
--- a/jjb/releng-templates.yaml
+++ b/jjb/releng-templates.yaml
@@ -1,19 +1,22 @@
 - job-template:
-    name: '{name}-release-java'
+    name: '{project-name}-release-java'
 
     # Job template for producing a release candidate by creating a staging repo
     # in Nexus.
 
     project-type: maven
-    node: dynamic_merge
+    node: '{build-node}'
     jdk: '{jdk}'
 
     logrotate:
         daysToKeep: '30'
 
     parameters:
-        - project-parameter:
+        - opendaylight-infra-parameters:
             project: '{project}'
+            branch: '{branch}'
+            refspec: 'refs/heads/{branch}'
+            artifacts: '{archive-artifacts}'
         - build-tag
         - stage-id-parameter:
             stage-id: '{stage-id}'
@@ -59,17 +62,20 @@
 
 
 - job-template:
-    name: '{name}-publish-p2repo'
+    name: '{project-name}-publish-p2repo'
 
     # Job template for publishing a p2 repo given a URL to a zipped p2repo.
 
     project-type: maven
-    node: dynamic_merge
+    node: '{build-node}'
     jdk: '{jdk}'
 
     parameters:
-        - project-parameter:
+        - opendaylight-infra-parameters:
             project: '{project}'
+            branch: '{branch}'
+            refspec: 'refs/heads/{branch}'
+            artifacts: '{archive-artifacts}'
         - p2zip-parameter
 
     wrappers:
@@ -106,7 +112,7 @@
 # Python Related
 
 - job-template:
-    name: '{name}-verify-python-{stream}'
+    name: '{project-name}-verify-python-{stream}'
 
     # Job template for python verify jobs
     #
@@ -120,7 +126,7 @@
     #                the workspace.
 
     project-type: freestyle
-    node: dynamic_verify
+    node: '{build-node}'
     concurrent: true
 
     logrotate:
@@ -130,12 +136,11 @@
         artifactNumToKeep: '-1'
 
     parameters:
-        - project-parameter:
-            project: '{project}'
-        - gerrit-parameters:
+        - opendaylight-infra-parameters:
             project: '{project}'
             branch: '{branch}'
             refspec: 'refs/heads/{branch}'
+            artifacts: '{archive-artifacts}'
 
     scm:
         - git:
@@ -190,20 +195,19 @@
             email-prefix: '[{project}]'
 
 - job-template:
-    name: '{name}-merge-rtd-{stream}'
+    name: '{project-name}-merge-rtd-{stream}'
     # Template for ReadTheDocs triggering
 
     project-type: freestyle
-    node: dynamic_verify
+    node: '{build-node}'
     concurrent: false
 
     parameters:
-        - project-parameter:
-            project: '{project}'
-        - gerrit-parameters:
+        - opendaylight-infra-parameters:
             project: '{project}'
             branch: '{branch}'
             refspec: 'refs/heads/{branch}'
+            artifacts: '{archive-artifacts}'
 
     wrappers:
         - opendaylight-infra-wrappers:
@@ -225,7 +229,7 @@
 # Node related
 
 - job-template:
-    name: '{name}-verify-node-{stream}'
+    name: '{project-name}-verify-node-{stream}'
 
     # Job template for python verify jobs
     #
@@ -240,7 +244,7 @@
     #     nodever:   version of node to install in virtualenv
 
     project-type: freestyle
-    node: dynamic_verify
+    node: '{build-node}'
     concurrent: true
 
     logrotate:
@@ -250,12 +254,11 @@
         artifactNumToKeep: '-1'
 
     parameters:
-        - project-parameter:
-            project: '{project}'
-        - gerrit-parameters:
+        - opendaylight-infra-parameters:
             project: '{project}'
             branch: '{branch}'
             refspec: 'refs/heads/{branch}'
+            artifacts: '{archive-artifacts}'
 
     scm:
         - git: