Merge "Fix autorelease staging job"

diff --combined jjb/autorelease/autorelease-templates.yaml
index aab6d76595285d2bb508594b04e7f80d8ba703b4,00c93f3332d9f3c156fcbbdfd5daad8465c739ce..d8245517491f8f98e49b484ea4599f51d5445c66
--- 1/jjb/autorelease/autorelease-templates.yaml
--- 2/jjb/autorelease/autorelease-templates.yaml
+++ b/jjb/autorelease/autorelease-templates.yaml
@@@ -12,6 -12,8 +12,8 @@@
          artifactDaysToKeep: '14'
  
      parameters:
+         - maven-exec:
+             maven-version: '{mvn33}'
          - opendaylight-infra-parameters:
              project: '{project}'
              branch: '{branch}'
@@@ -42,6 -44,14 +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"
@@@ -74,15 -84,15 +84,15 @@@
              cp *.log *.prop $_
  
      publishers:
 -    - email-notification:
 -        email-prefix: '[autorelease]'
 -    - trigger-parameterized-builds:
 -        - project: 'integration-distribution-test-{integration-test}'
 -          condition: UNSTABLE_OR_BETTER
 -          property-file: variables.prop
 -          fail-on-missing: true
 -    - opendaylight-infra-shiplogs:
 -        maven-version: '{mvn33}'
 +        - email-notification:
 +            email-prefix: '[autorelease]'
 +        - trigger-parameterized-builds:
 +            - project: 'integration-distribution-test-{integration-test}'
 +              condition: UNSTABLE_OR_BETTER
 +              property-file: variables.prop
 +              fail-on-missing: true
 +        - opendaylight-infra-shiplogs:
 +            maven-version: '{mvn33}'
  
  - job-template:
      name: 'autorelease-project-report-{stream}'
@@@ -134,17 -144,18 +144,17 @@@
          - autorelease-sys-stats
  
      publishers:
 -    - email-ext:
 -        attachments: 'project-reports/*.log'
 -        recipients: 'skitt@redhat.com thanh.ha@linuxfoundation.org'
 -        reply-to: dev@lists.opendaylight.org
 -        content-type: default
 -        subject: '[releng] ODL {stream} project report for ${{ENV, var="DATE"}}'
 -        body: |
 -            This is a project report generated on $DATE listing the commit
 -            history of ODL projects for the past week. See attached
 -            git-report.log
 -
 -            Archive also available on Jenkins at $BUILD_URL
 -        always: true
 -    - opendaylight-infra-shiplogs:
 -        maven-version: '{mvn33}'
 +        - email-ext:
 +            attachments: 'project-reports/*.log'
 +            recipients: 'skitt@redhat.com thanh.ha@linuxfoundation.org'
 +            reply-to: dev@lists.opendaylight.org
 +            content-type: default
 +            subject: '[releng] ODL {stream} project report for ${{ENV, var="DATE"}}'
 +            body: |
 +                This is a project report generated on $DATE listing the commit
 +                history of ODL projects for the past week. See attached
 +                git-report.log
 +                Archive also available on Jenkins at $BUILD_URL
 +            always: true
 +        - opendaylight-infra-shiplogs:
 +            maven-version: '{mvn33}'