refactor email recipients to parameter with default value

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

diff --git a/jjb/autorelease/autorelease-templates.yaml b/jjb/autorelease/autorelease-templates.yaml
index aab6d76595285d2bb508594b04e7f80d8ba703b4..2e62a848da9e8752aebda744da87ebec52712526 100644 (file)
--- a/jjb/autorelease/autorelease-templates.yaml
+++ b/jjb/autorelease/autorelease-templates.yaml
@@ -12,6 +12,8 @@
         artifactDaysToKeep: '14'
 
     parameters:
+        - maven-exec:
+            maven-version: 'mvn33'
         - opendaylight-infra-parameters:
             project: '{project}'
             branch: '{branch}'
@@ -42,6 +44,14 @@
         - timed: 'H 0 * * *'
 
     builders:
+        # force jenkins install of maven version before any shell scripts use it
+        - maven-target:
+            maven-version: 'mvn33'
+            goals: '-version'
+            settings: 'autorelease-settings'
+            settings-type: cfp
+            global-settings: 'odl-global-settings'
+            global-settings-type: cfp
         - wipe-local-maven-repo
         - jacoco-nojava-workaround
         - shell: "./scripts/list-project-dependencies.sh"
@@ -52,7 +62,7 @@
         - autorelease-distribute-taglist
         - autorelease-generate-release-patches
         - maven-target:
-              maven-version: '{mvn33}'
+              maven-version: 'mvn33'
               pom: 'pom.xml'
               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'
               java-opts:
@@ -64,7 +74,7 @@
         - autorelease-maven-deploy
         - autorelease-get-integration-test-variables
         - autorelease-maven-sources:
-            maven-version: '{mvn33}'
+            maven-version: 'mvn33'
             settings: 'autorelease-settings'
             global-settings: 'odl-global-settings'
         - autorelease-maven-sources-post-process
@@ -75,14 +85,15 @@
 
     publishers:
         - email-notification:
+            email-recipients: '{email-recipients}'
             email-prefix: '[autorelease]'
         - trigger-parameterized-builds:
             - project: 'integration-distribution-test-{integration-test}'
               condition: UNSTABLE_OR_BETTER
-              property-file: variables.prop
+              property-file: variables.jenkins-trigger
               fail-on-missing: true
         - opendaylight-infra-shiplogs:
-            maven-version: '{mvn33}'
+            maven-version: 'mvn33'
 
 - job-template:
     name: 'autorelease-project-report-{stream}'
@@ -147,4 +158,4 @@
                 Archive also available on Jenkins at $BUILD_URL
             always: true
         - opendaylight-infra-shiplogs:
-            maven-version: '{mvn33}'
+            maven-version: 'mvn33'