Merge "Add a note regarding deploy maven jobs"

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

diff --git a/jjb/releng-templates.yaml b/jjb/releng-templates.yaml
index 89d8ec83bda8b46236b341ab742bb7dfb40830ab..270820027e00aa11dc34578a4eaa0023b1b540ae 100644 (file)
--- a/jjb/releng-templates.yaml
+++ b/jjb/releng-templates.yaml
@@ -4,7 +4,7 @@
     # Job template for producing a release candidate by creating a staging repo
     # in Nexus.
 
-    project-type: maven
+    project-type: freestyle
     node: '{build-node}'
     jdk: '{jdk}'
 
@@ -35,32 +35,29 @@
         - 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'
-        settings-type: cfp
-        global-settings: 'odl-global-settings'
-        global-settings-type: cfp
-        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:
         - email-notification:
             email-prefix: '[releng]'
         - opendaylight-infra-shiplogs:
-            maven-version: '{mvn33}'
+            maven-version: 'mvn33'
 
 
 - job-template:
@@ -68,7 +65,7 @@
 
     # Job template for publishing a p2 repo given a URL to a zipped p2repo.
 
-    project-type: maven
+    project-type: freestyle
     node: '{build-node}'
     jdk: '{jdk}'
 
@@ -84,26 +81,24 @@
         - opendaylight-infra-wrappers:
             build-timeout: '{build-timeout}'
 
-    prebuilders:
+    builders:
         - wipe-org-opendaylight-repo
         - jacoco-nojava-workaround
         - releng-fetch-p2zip-if-necessary:
-            maven-version: '{mvn33}'
+            maven-version: 'mvn33'
             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: '{mvn-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}'
+            maven-version: 'mvn33'
             settings: '{mvn-settings}'
             global-settings: 'odl-global-settings'
 
@@ -111,7 +106,7 @@
         - email-notification:
             email-prefix: '[releng]'
         - opendaylight-infra-shiplogs:
-            maven-version: '{mvn33}'
+            maven-version: 'mvn33'
 
 # Python Related
 
@@ -124,8 +119,8 @@
     # template.
     #
     # Required Variables:
-    #     stream:    release stream (eg. stable-lithium or beryllium)
-    #     branch:    git branch (eg. stable/lithium or master)
+    #     stream:    release stream (eg. boron or carbon)
+    #     branch:    git branch (eg. stable/boron or master)
     #     toxdir:    directory containing the project's tox.ini relative to
     #                the workspace. Empty works if tox.ini is at project root.
 
@@ -198,7 +193,7 @@
         - email-notification:
             email-prefix: '[{project}]'
         - opendaylight-infra-shiplogs:
-            maven-version: '{mvn33}'
+            maven-version: 'mvn33'
 
 - job-template:
     name: '{project-name}-merge-rtd-{stream}'
@@ -232,7 +227,7 @@
         - email-notification:
             email-prefix: '[{project}]'
         - opendaylight-infra-shiplogs:
-            maven-version: '{mvn33}'
+            maven-version: 'mvn33'
 
 # Node related
 
@@ -246,8 +241,8 @@
     # virtualenv for nodejs.
     #
     # Required Variables:
-    #     stream:    release stream (eg. stable-lithium or beryllium)
-    #     branch:    git branch (eg. stable/lithium or master)
+    #     stream:    release stream (eg. boron or carbon)
+    #     branch:    git branch (eg. stable/boron or master)
     #     nodedir:   directory of nodejs project to run node test against
     #     nodever:   version of node to install in virtualenv
 
@@ -327,4 +322,4 @@
         - email-notification:
             email-prefix: '[{project}]'
         - opendaylight-infra-shiplogs:
-            maven-version: '{mvn33}'
+            maven-version: 'mvn33'