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

diff --git a/jjb/releng-templates.yaml b/jjb/releng-templates.yaml
index 753e1774f..ed4f70445 100644
--- a/jjb/releng-templates.yaml
+++ b/jjb/releng-templates.yaml
@@ -1,26 +1,29 @@
 - 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}'
 
     scm:
         - git:
-            credentials-id: '{ssh-credentials}'
+            credentials-id: 'opendaylight-jenkins-ssh'
             url: '$GIT_BASE'
             branches:
                 - '$BUILD_TAG'
@@ -29,25 +32,23 @@
             wipe-workspace: true
 
     wrappers:
-        - build-timeout
-        - ssh-agent-credentials:
-            users:
-                - '{ssh-credentials}'
+        - opendaylight-infra-wrappers:
+            build-timeout: '{build-timeout}'
 
     prebuilders:
         - wipe-org-opendaylight-repo
         - jacoco-nojava-workaround
         - provide-maven-settings:
-            global-settings-file: '{odl-global-settings}'
-            settings-file: '{autorelease-settings}'
+            global-settings-file: 'odl-global-settings'
+            settings-file: 'autorelease-settings'
 
     maven:
         maven-name: '{mvn33}'
         root-pom: 'pom.xml'
-        goals: 'clean deploy -V -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r  -Djenkins -DaltDeploymentRepository=staging::default::file:hide/from/pom/files/stage'
+        goals: 'clean deploy -V -B -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r -Djenkins -DaltDeploymentRepository=staging::default::file:hide/from/pom/files/stage'
         maven-opts: '-Xmx1024m -XX:MaxPermSize=256m'
-        settings: '{autorelease-settings}'
-        global-settings: '{odl-global-settings}'
+        settings: 'autorelease-settings'
+        global-settings: 'odl-global-settings'
         post-step-run-condition: UNSTABLE
 
     postbuilders:
@@ -61,26 +62,33 @@
 
 
 - 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:
+        - opendaylight-infra-wrappers:
+            build-timeout: '{build-timeout}'
+
     prebuilders:
         - wipe-org-opendaylight-repo
         - jacoco-nojava-workaround
         - releng-fetch-p2zip-if-necessary:
             maven-version: '{mvn33}'
             settings: '{project-settings}'
-            global-settings: '{odl-global-settings}'
+            global-settings: 'odl-global-settings'
         - releng-generate-p2pom
 
     maven:
@@ -88,14 +96,14 @@
         root-pom: 'pom.xml'
         goals: 'clean deploy -V -B -Dmaven.repo.local=/tmp/r'
         settings: '{project-settings}'
-        global-settings: '{odl-global-settings}'
+        global-settings: 'odl-global-settings'
         post-step-run-condition: UNSTABLE
 
     postbuilders:
         - releng-update-p2composite-metadata:
             maven-version: '{mvn33}'
             settings: '{project-settings}'
-            global-settings: '{odl-global-settings}'
+            global-settings: 'odl-global-settings'
 
     publishers:
         - email-notification:
@@ -104,7 +112,7 @@
 # Python Related
 
 - job-template:
-    name: '{name}-verify-python-{stream}'
+    name: '{project-name}-verify-python-{stream}'
 
     # Job template for python verify jobs
     #
@@ -118,7 +126,7 @@
     #                the workspace.
 
     project-type: freestyle
-    node: dynamic_verify
+    node: '{build-node}'
     concurrent: true
 
     logrotate:
@@ -128,16 +136,15 @@
         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:
-            credentials-id: '{ssh-credentials}'
+            credentials-id: 'opendaylight-jenkins-ssh'
             url: '$GIT_BASE'
             basedir: 'repo'
             refspec: '$GERRIT_REFSPEC'
@@ -147,10 +154,8 @@
             choosing-strategy: 'gerrit'
 
     wrappers:
-        - build-timeout
-        - ssh-agent-credentials:
-            users:
-                - '{ssh-credentials}'
+        - opendaylight-infra-wrappers:
+            build-timeout: '{build-timeout}'
 
     triggers:
         - gerrit:
@@ -190,26 +195,23 @@
             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:
-        - build-timeout
-        - ssh-agent-credentials:
-            users:
-                - '{ssh-credentials}'
+        - opendaylight-infra-wrappers:
+            build-timeout: '{build-timeout}'
 
     triggers:
         - gerrit-trigger-patch-merged:
@@ -227,7 +229,7 @@
 # Node related
 
 - job-template:
-    name: '{name}-verify-node-{stream}'
+    name: '{project-name}-verify-node-{stream}'
 
     # Job template for python verify jobs
     #
@@ -242,7 +244,7 @@
     #     nodever:   version of node to install in virtualenv
 
     project-type: freestyle
-    node: dynamic_verify
+    node: '{build-node}'
     concurrent: true
 
     logrotate:
@@ -252,16 +254,15 @@
         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:
-            credentials-id: '{ssh-credentials}'
+            credentials-id: 'opendaylight-jenkins-ssh'
             url: '$GIT_BASE'
             basedir: 'repo'
             refspec: '$GERRIT_REFSPEC'
@@ -271,10 +272,8 @@
             choosing-strategy: 'gerrit'
 
     wrappers:
-        - build-timeout
-        - ssh-agent-credentials:
-            users:
-                - '{ssh-credentials}'
+        - opendaylight-infra-wrappers:
+            build-timeout: '{build-timeout}'
 
     triggers:
         - gerrit: