Change autorelease jobs to timeout after 15h

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

diff --git a/jjb/autorelease/autorelease-templates.yaml b/jjb/autorelease/autorelease-templates.yaml
index 8ef0deffa26c49d4078f79b864f3c5462f88e78a..284fdef09c0635d96479e9cabca753b4b42bd26c 100644 (file)
--- a/jjb/autorelease/autorelease-templates.yaml
+++ b/jjb/autorelease/autorelease-templates.yaml
@@ -8,15 +8,12 @@
     jdk: '{jdk}'
     cron: 'H 0 * * *'
 
+    # Default variable values
+    extra-mvn-opts: ''
+
     properties:
-      - build-discarder:
-          days-to-keep: '30'
-          num-to-keep: 40
-          artifact-num-to-keep: 1
-    # Make sure we only archive the last artifact until we figure out why
-    # autorelease carbon is not generating a staging repo.
-    #   - opendaylight-infra-properties:
-    #       build-days-to-keep: '30'
+      - opendaylight-infra-properties:
+          build-days-to-keep: '30'
 
     parameters:
       - maven-exec:
@@ -33,6 +30,17 @@
           release-tag: '{next-release-tag}'
       - autorelease-release-branch:
           release-branch: '{branch}'
+      - string:
+          name: EXTRA_MVN_OPTS
+          default: '{extra-mvn-opts}'
+          description: |
+              Additional optional Maven Options to pass to the Maven Goals
+              parameter.
+
+              Examples:
+              -Dskip.karaf.featureTest=true  # To disable karaf SingleFeatureTests
+              --fail-never   # NEVER fail the build, regardless of project result
+              --fail-at-end  # Only fail the build afterwards; allow all non-impacted builds to continue
 
     scm:
       - git:
@@ -49,7 +57,7 @@
 
     wrappers:
       - opendaylight-infra-wrappers:
-          build-timeout: '1440'
+          build-timeout: '900'
 
     triggers:
       - timed: '{cron}'
@@ -85,6 +93,7 @@
           pom: 'pom.xml'
           goals: |
               clean deploy
+              $EXTRA_MVN_OPTS
               -Pintegrationtests,docs,repoBuild
               -Dcheckstyle.skip=true
               -DaltDeploymentRepository=staging::default::file:hide/from/pom/files/stage
@@ -114,9 +123,7 @@
           # Need to archive dependencies.log in Jenkins to provide a simple
           # way for downstream jobs to pull the latest version of this file
           # in their builds.
-          # TODO stop archiving **/*.zip once we figure out why artifacts are
-          #      not deploying to Nexus
-          artifacts: 'dependencies.log, **/*.zip, /var/log/sa/*'
+          artifacts: 'dependencies.log'
       - trigger-parameterized-builds:
           - project: 'autorelease-generate-release-notes-{stream}'
             condition: UNSTABLE_OR_BETTER
@@ -128,12 +135,14 @@
             fail-on-missing: true
           - project: 'integration-distribution-test-{integration-test}'
             condition: FAILED
+            trigger-with-no-params: true
           - project: 'integration-sanity-test-{integration-test}'
             condition: UNSTABLE_OR_BETTER
             property-file: variables.jenkins-trigger
             fail-on-missing: true
           - project: 'integration-sanity-test-{integration-test}'
             condition: FAILED
+            trigger-with-no-params: true
           - project: 'packaging-build-rpm-master'
             condition: UNSTABLE_OR_BETTER
             predefined-parameters: DOWNLOAD_URL=$BUNDLE_URL
@@ -207,7 +216,5 @@
 
     publishers:
       - opendaylight-infra-sysstats
-      - archive:
-          artifacts: 'scripts/release_notes_management/projects/release-notes.rst, /var/log/sa/*'
       - opendaylight-infra-shiplogs:
           maven-version: 'mvn33'