X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=jjb%2Freleng-templates.yaml;h=1313166fdaa2984ab035b1c06fec46c3d43e9052;hb=f5a29ef027b19b09b4736ddfbccfcffc96188ab3;hp=edaef8b750ce779f01828b4ad654509c52209675;hpb=e9cd50385932004c20f60fde9453dd05db31fcae;p=releng%2Fbuilder.git

diff --git a/jjb/releng-templates.yaml b/jjb/releng-templates.yaml
index edaef8b75..1313166fd 100644
--- a/jjb/releng-templates.yaml
+++ b/jjb/releng-templates.yaml
@@ -1,11 +1,11 @@
 - 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
+    project-type: freestyle
+    node: '{build-node}'
     jdk: '{jdk}'
 
     logrotate:
@@ -35,39 +35,38 @@
         - opendaylight-infra-wrappers:
             build-timeout: '{build-timeout}'
 
-    prebuilders:
+    builders:
         - wipe-org-opendaylight-repo
         - jacoco-nojava-workaround
         - provide-maven-settings:
             global-settings-file: 'odl-global-settings'
             settings-file: 'autorelease-settings'
-
-    maven:
-        maven-name: '{mvn33}'
-        root-pom: 'pom.xml'
-        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'
-        post-step-run-condition: UNSTABLE
-
-    postbuilders:
+        - maven-target:
+            maven-version: '{mvn33}'
+            pom: 'pom.xml'
+            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'
+            java-opts:
+              - '-Xmx1024m -XX:MaxPermSize=256m'
+            settings: 'autorelease-settings'
+            settings-type: cfp
+            global-settings: 'odl-global-settings'
+            global-settings-type: cfp
         - releng-stage-release
 
     publishers:
-        - archive-artifacts:
-            artifacts: '*.log'
         - email-notification:
             email-prefix: '[releng]'
+        - opendaylight-infra-shiplogs:
+            maven-version: '{mvn33}'
 
 
 - 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
+    project-type: freestyle
+    node: '{build-node}'
     jdk: '{jdk}'
 
     parameters:
@@ -82,37 +81,37 @@
         - opendaylight-infra-wrappers:
             build-timeout: '{build-timeout}'
 
-    prebuilders:
+    builders:
         - wipe-org-opendaylight-repo
         - jacoco-nojava-workaround
         - releng-fetch-p2zip-if-necessary:
             maven-version: '{mvn33}'
-            settings: '{project-settings}'
+            settings: '{mvn-settings}'
             global-settings: 'odl-global-settings'
         - releng-generate-p2pom
-
-    maven:
-        maven-name: '{mvn33}'
-        root-pom: 'pom.xml'
-        goals: 'clean deploy -V -B -Dmaven.repo.local=/tmp/r'
-        settings: '{project-settings}'
-        global-settings: 'odl-global-settings'
-        post-step-run-condition: UNSTABLE
-
-    postbuilders:
+        - maven-target:
+            maven-version: '{mvn33}'
+            pom: 'pom.xml'
+            goals: 'clean deploy -V -B -Dmaven.repo.local=/tmp/r'
+            settings: '{mvn-settings}'
+            settings-type: cfp
+            global-settings: 'odl-global-settings'
+            global-settings-type: cfp
         - releng-update-p2composite-metadata:
             maven-version: '{mvn33}'
-            settings: '{project-settings}'
+            settings: '{mvn-settings}'
             global-settings: 'odl-global-settings'
 
     publishers:
         - email-notification:
             email-prefix: '[releng]'
+        - opendaylight-infra-shiplogs:
+            maven-version: '{mvn33}'
 
 # Python Related
 
 - job-template:
-    name: '{name}-verify-python-{stream}'
+    name: '{project-name}-verify-python-{stream}'
 
     # Job template for python verify jobs
     #
@@ -123,10 +122,10 @@
     #     stream:    release stream (eg. stable-lithium or beryllium)
     #     branch:    git branch (eg. stable/lithium or master)
     #     toxdir:    directory containing the project's tox.ini relative to
-    #                the workspace.
+    #                the workspace. Empty works if tox.ini is at project root.
 
     project-type: freestyle
-    node: dynamic_verify
+    node: '{build-node}'
     concurrent: true
 
     logrotate:
@@ -193,13 +192,15 @@
     publishers:
         - email-notification:
             email-prefix: '[{project}]'
+        - opendaylight-infra-shiplogs:
+            maven-version: '{mvn33}'
 
 - 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:
@@ -225,11 +226,13 @@
     publishers:
         - email-notification:
             email-prefix: '[{project}]'
+        - opendaylight-infra-shiplogs:
+            maven-version: '{mvn33}'
 
 # Node related
 
 - job-template:
-    name: '{name}-verify-node-{stream}'
+    name: '{project-name}-verify-node-{stream}'
 
     # Job template for python verify jobs
     #
@@ -244,7 +247,7 @@
     #     nodever:   version of node to install in virtualenv
 
     project-type: freestyle
-    node: dynamic_verify
+    node: '{build-node}'
     concurrent: true
 
     logrotate:
@@ -318,3 +321,5 @@
     publishers:
         - email-notification:
             email-prefix: '[{project}]'
+        - opendaylight-infra-shiplogs:
+            maven-version: '{mvn33}'