Merge "Enable batch mode for distribution and validate"

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

diff --git a/jjb/autorelease/autorelease-templates.yaml b/jjb/autorelease/autorelease-templates.yaml
index 329e939292b670daa513fa7dc6bb1cadde5783f7..ee44dbfafabc1fd5732a33f2f05f9ca51a6ac0b9 100644 (file)
--- a/jjb/autorelease/autorelease-templates.yaml
+++ b/jjb/autorelease/autorelease-templates.yaml
@@ -9,9 +9,7 @@
 
     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:
@@ -55,8 +53,8 @@
     maven:
         maven-name: '{mvn33}'
         root-pom: 'pom.xml'
-        goals: 'clean install -Pintegrationtests,docs,repoBuild -Djenkins -Dcheckstyle.skip=true -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r'
-        maven-opts: '-Xmx8g -XX:MaxPermSize=1024m -Dmaven.compile.fork=true'
+        goals: 'clean 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: '-Xmx10g -XX:MaxPermSize=1024m -Dmaven.compile.fork=true'
         settings: '{autorelease-settings}'
         global-settings: '{odl-global-settings}'
         automatic-archiving: true
@@ -80,7 +78,7 @@
         email-prefix: '[autorelease]'
     - trigger-parameterized-builds:
         - project: 'integration-distribution-test-{integration-test}'
-          condition: SUCCESS
+          condition: UNSTABLE_OR_BETTER
           property-file: variables.prop
           fail-on-missing: true