Merge "make use of ODL_RELEASE in networking-odl"

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

diff --git a/jjb/autorelease/autorelease-master.yaml b/jjb/autorelease/autorelease-master.yaml
index 2e0c1f6a3d91a47c191194318d211e8152c3977c..cb5df6270d52597610315cb1674e6a46f038584d 100644 (file)
--- a/jjb/autorelease/autorelease-master.yaml
+++ b/jjb/autorelease/autorelease-master.yaml
@@ -27,6 +27,8 @@
             project: '{project}'
         - autorelease-release-tag:
             release-tag: 'Daily'
+        - autorelease-release-branch:
+            release-branch: '{branch}'
 
     scm:
         - git:
@@ -36,12 +38,14 @@
             branches:
                 - 'origin/{branch}'
             skip-tag: true
-            recursive-submodules: true
+            submodule:
+                recursive: true
 
     wrappers:
         - autorelease-build-timeout
         - ssh-agent-credentials:
-            user: '{ssh-credentials}'
+            users:
+                - '{ssh-credentials}'
 
     triggers:
         - timed: 'H 0 * * *'
@@ -59,12 +63,8 @@
         global-settings: '{odl-global-settings}'
 
     postbuilders:
-        - maven-target:
+        - autorelease-maven-sources:
             maven-version: '{mvn32}'
-            pom: 'pom.xml'
-            goals: 'dependency:sources -l sources.log -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r'
-            java-opts:
-                - '-Xmx4096m -XX:MaxPermSize=1024m'
             settings: '{autorelease-settings}'
             global-settings: '{odl-global-settings}'
         - jacoco-nojava-workaround