Merge "Adding daily scalability and fixing existing Cbench daily"

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

diff --git a/jjb/autorelease/autorelease-master.yaml b/jjb/autorelease/autorelease-master.yaml
index 22f1ea0a0347f8660b59a23fc3508adc8a2aa93e..cb5df6270d52597610315cb1674e6a46f038584d 100644 (file)
--- a/jjb/autorelease/autorelease-master.yaml
+++ b/jjb/autorelease/autorelease-master.yaml
@@ -5,12 +5,7 @@
     jobs:
         - 'autorelease-daily-master'
 
-    # stream:    branch with - in place of / (eg. stable-helium)
-    # branch:    branch (eg. stable/helium)
-    stream:
-        - master:
-            branch: 'master'
-
+    branch: 'master'
     project: 'releng/autorelease'
     jdk: 'openjdk7'
 
@@ -32,6 +27,8 @@
             project: '{project}'
         - autorelease-release-tag:
             release-tag: 'Daily'
+        - autorelease-release-branch:
+            release-branch: '{branch}'
 
     scm:
         - git:
@@ -39,14 +36,16 @@
             url: '$GIT_BASE'
             refspec: ''
             branches:
-                - 'origin/master'
+                - '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 * * *'
@@ -64,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