Unify maven goal options some more

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

diff --git a/jjb/autorelease/autorelease-templates.yaml b/jjb/autorelease/autorelease-templates.yaml
index 185c0636304df9c00b5fb406193dc2498291d695..7ec714ee1ae0478144bcf53aac1131a8198e3cc0 100644 (file)
--- a/jjb/autorelease/autorelease-templates.yaml
+++ b/jjb/autorelease/autorelease-templates.yaml
@@ -9,19 +9,15 @@
 
     logrotate:
         daysToKeep: '{build-days-to-keep}'
-        numToKeep: '{build-num-to-keep}'
-        artifactDaysToKeep: '{build-artifact-days-to-keep}'
-        artifactNumToKeep: '{build-artifact-num-to-keep}'
+        artifactDaysToKeep: '14'
 
     parameters:
         - project-parameter:
             project: '{project}'
         - autorelease-release-tag:
-            release-tag: '{stream}-daily'
+            release-tag: '{next-release-tag}'
         - autorelease-release-branch:
             release-branch: '{branch}'
-        - autorelease-release-datestamp:
-            datestamp: true
 
     scm:
         - git:
@@ -33,6 +29,7 @@
             skip-tag: true
             submodule:
                 recursive: true
+                timeout: 60
 
     wrappers:
         - autorelease-build-timeout
@@ -44,21 +41,24 @@
         - timed: 'H 0 * * *'
 
     prebuilders:
-        - wipe-org-opendaylight-repo
+        - wipe-local-maven-repo
         - jacoco-nojava-workaround
         - autorelease-cfp:
             autorelease-settings: '{autorelease-settings}'
             odl-global-settings: '{odl-global-settings}'
         - autorelease-generate-taglist
+        - autorelease-distribute-taglist
         - autorelease-generate-release-patches
 
     maven:
         maven-name: '{mvn33}'
         root-pom: 'pom.xml'
-        goals: 'clean install deploy -Pintegrationtests,docs,repoBuild -Djenkins -Dcheckstyle.skip=true -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r -DaltDeploymentRepository=staging::default::file:hide/from/pom/files/stage'
-        maven-opts: '-Xmx8g -XX:MaxPermSize=1024m -Dmaven.compile.fork=true'
+        goals: 'clean deploy -V -B -Pintegrationtests,docs,repoBuild -Djenkins -Dcheckstyle.skip=true -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r -DaltDeploymentRepository=staging::default::file:hide/from/pom/files/stage'
+        maven-opts: '-Xmx10g -XX:MaxPermSize=1024m -Dmaven.compile.fork=true'
         settings: '{autorelease-settings}'
+        settings-type: cfp
         global-settings: '{odl-global-settings}'
+        global-settings-type: cfp
         automatic-archiving: true
         post-step-run-condition: UNSTABLE
 
@@ -75,7 +75,7 @@
 
     publishers:
     - archive-artifacts:
-        artifacts: '*.prop,*.log,patches/*.patch,patches/*.log'
+        artifacts: '*.prop,*.log,patches/*.bundle,patches/*.patch,patches/*.log'
     - email-notification:
         email-prefix: '[autorelease]'
     - trigger-parameterized-builds:
@@ -175,8 +175,10 @@
     parameters:
     - project-parameter:
         project: '{project}'
-    - gerrit-parameter:
+    - gerrit-parameters:
+        project: '{project}'
         branch: '{branch}'
+        refspec: 'refs/heads/{branch}'
 
     scm:
     - gerrit-trigger-scm:
@@ -200,7 +202,9 @@
         goals: 'site:site site:deploy -Dstream={stream}'
         maven-opts: '-Xmx1024m'
         settings: '{autorelease-settings}'
+        settings-type: cfp
         global-settings: '{odl-global-settings}'
+        global-settings-type: cfp
 
     publishers:
     - email-notification:
@@ -225,8 +229,10 @@
     parameters:
     - project-parameter:
         project: '{project}'
-    - gerrit-parameter:
+    - gerrit-parameters:
+        project: '{project}'
         branch: '{branch}'
+        refspec: 'refs/heads/{branch}'
 
     scm:
     - gerrit-trigger-scm:
@@ -250,7 +256,9 @@
         goals: 'site:site -Dstream={stream}'
         maven-opts: '-Xmx1024m'
         settings: '{autorelease-settings}'
+        settings-type: cfp
         global-settings: '{odl-global-settings}'
+        global-settings-type: cfp
 
     publishers:
         - email-notification: