Merge "Fix autorelease staging job"

diff --git a/jjb/autorelease/autorelease-templates.yaml b/jjb/autorelease/autorelease-templates.yaml
index aab6d76595285d2bb508594b04e7f80d8ba703b4..d8245517491f8f98e49b484ea4599f51d5445c66 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"

diff --git a/jjb/autorelease/include-raw-autorelease-maven-deploy.sh b/jjb/autorelease/include-raw-autorelease-maven-deploy.sh
index 23e606bb76ced63ee15dbab397ee151b718a9375..90861b94b94d84da91177bd22ec0dc08b778d923 100644 (file)
--- a/jjb/autorelease/include-raw-autorelease-maven-deploy.sh
+++ b/jjb/autorelease/include-raw-autorelease-maven-deploy.sh
@@ -29,7 +29,7 @@ rsync -avz --exclude 'maven-metadata*' \
            --exclude 'resolver-status.properties' \
            "stage/org/opendaylight/integration" m2repo/org/opendaylight/
 
-mvn -V -B org.sonatype.plugins:nexus-staging-maven-plugin:1.6.2:deploy-staged-repository \
+"$MVN" -V -B org.sonatype.plugins:nexus-staging-maven-plugin:1.6.2:deploy-staged-repository \
     -DrepositoryDirectory="`pwd`/m2repo" \
     -DnexusUrl=https://nexus.opendaylight.org/ \
     -DstagingProfileId="425e43800fea70" \

diff --git a/jjb/releng-macros.yaml b/jjb/releng-macros.yaml
index c6961aee37b78810c9f2a3618f83952473970fe3..32bd3c5f56492757a430d10d4b4444738a0e2a85 100644 (file)
--- a/jjb/releng-macros.yaml
+++ b/jjb/releng-macros.yaml
@@ -72,6 +72,14 @@
             default: '{stage-id}'
             description: 'Nexus staging profile id'
 
+- parameter:
+    name: maven-exec
+    parameters:
+      - string:
+          name: MVN
+          default: '$HOME/tools/hudson.tasks.Maven_MavenInstallation/{maven-version}/bin/mvn'
+          description: 'Maven selector to be used by shell scripts'
+
 - scm:
     name: git-scm
     scm: