Merge "DO NOT hardcode mvn staging server id"

diff --git a/.jjb-test/expected-xml/gerrit-maven-maven-release-master b/.jjb-test/expected-xml/gerrit-maven-maven-release-master
index dd64963..4e72be7 100644 (file)
--- a/.jjb-test/expected-xml/gerrit-maven-maven-release-master
+++ b/.jjb-test/expected-xml/gerrit-maven-maven-release-master
@@ -144,6 +144,9 @@ For example '<1.0.0' or '>=1.0.0,<2.0.0'.
     </extensions>
   </scm>
   <triggers class="vector">
+    <hudson.triggers.TimerTrigger>
+      <spec/>
+    </hudson.triggers.TimerTrigger>
     <com.sonyericsson.hudson.plugins.gerrit.trigger.hudsontrigger.GerritTrigger>
       <spec/>
       <gerritProjects>

diff --git a/.jjb-test/expected-xml/github-maven-maven-release-master b/.jjb-test/expected-xml/github-maven-maven-release-master
index ca84180..d36ee34 100644 (file)
--- a/.jjb-test/expected-xml/github-maven-maven-release-master
+++ b/.jjb-test/expected-xml/github-maven-maven-release-master
@@ -139,6 +139,9 @@ For example '<1.0.0' or '>=1.0.0,<2.0.0'.
     </extensions>
   </scm>
   <triggers class="vector">
+    <hudson.triggers.TimerTrigger>
+      <spec/>
+    </hudson.triggers.TimerTrigger>
     <org.jenkinsci.plugins.ghprb.GhprbTrigger>
       <spec/>
       <adminlist/>

diff --git a/jjb/lf-maven-jobs.yaml b/jjb/lf-maven-jobs.yaml
index 452b839..66ce41d 100644 (file)
--- a/jjb/lf-maven-jobs.yaml
+++ b/jjb/lf-maven-jobs.yaml
@@ -486,6 +486,9 @@
     #     :gerrit_verify_triggers: Override Gerrit Triggers.
     #     :mvn-global-settings: The name of the Maven global settings to use for
     #                           Maven configuration. (default: global-settings)
+    #     :cron: Cron schedule when to trigger the job. This parameter also
+    #         supports multiline input via YAML pipe | character in cases where
+    #         one may want to provide more than 1 cron timer. (default: '')
 
     ######################
     # Default parameters #
@@ -502,6 +505,7 @@
     mvn-version: mvn33
     stream: master
     submodule-recursive: true
+    cron: ''
 
     gerrit_release_triggers:
       - comment-added-contains-event:
@@ -545,6 +549,7 @@
           choosing-strategy: default
 
     triggers:
+      - timed: '{obj:cron}'
       - gerrit:
           server-name: '{gerrit-server-name}'
           trigger-on: '{obj:gerrit_release_triggers}'
@@ -576,6 +581,7 @@
           jenkins-ssh-credential: '{jenkins-ssh-credential}'
 
     triggers:
+      - timed: '{obj:cron}'
       - lf-infra-github-pr-trigger:
           trigger-phrase: '^build release$'
           only-trigger-phrase: true