Pass multiple pattern args in logs-deploy.sh

[releng/global-jjb.git] / jjb / lf-rtd-jobs.yaml

diff --git a/jjb/lf-rtd-jobs.yaml b/jjb/lf-rtd-jobs.yaml
index 0f4aa8b..9f686e2 100644 (file)
--- a/jjb/lf-rtd-jobs.yaml
+++ b/jjb/lf-rtd-jobs.yaml
@@ -45,7 +45,6 @@
           branch: '{branch}'
           refspec: 'refs/heads/{branch}'
           stream: '{stream}'
-          lftools-version: '{lftools-version}'
 
     wrappers:
       - lf-infra-wrappers:
@@ -80,6 +79,7 @@
       - change-merged-event
       - comment-added-contains-event:
           comment-contains-value: remerge$
+      - ref-updated-event
 
     #####################
     # Job Configuration #
@@ -110,6 +110,8 @@
               branches:
                 - branch-compare-type: 'ANT'
                   branch-pattern: '**/{branch}'
+                - branch-compare-type: 'ANT'
+                  branch-pattern: 'refs/tags/**'
               file-paths: '{obj:gerrit_trigger_file_paths}'
 
 - job-template:
@@ -165,6 +167,7 @@
     project-pattern: '**'
     stream: master
     submodule-recursive: true
+    submodule-timeout: 10
     gerrit-skip-vote: false
 
     gerrit_verify_triggers:
@@ -202,6 +205,7 @@
           git-url: '{git-url}'
           refspec: ''  # Leave blank!! A later script will handle fetching
           submodule-recursive: '{submodule-recursive}'
+          submodule-timeout: '{submodule-timeout}'
           choosing-strategy: default
 
     triggers:
@@ -241,6 +245,7 @@
           refspec: '+refs/pull/*:refs/remotes/origin/pr/*'
           branch: '$sha1'
           submodule-recursive: '{submodule-recursive}'
+          submodule-timeout: '{submodule-timeout}'
           choosing-strategy: default
           jenkins-ssh-credential: '{jenkins-ssh-credential}'