X-Git-Url: https://gerrit.linuxfoundation.org/infra/gitweb?a=blobdiff_plain;f=jjb%2Flf-rtd-jobs.yaml;h=9f686e2a3187cb37d0e929ffc271bfaa128fcab1;hb=36e3b07003dfc0ee41fb8a74197e64a0511eb8ed;hp=cb044d9b9fc599bd17540df7c60bc514b3d80d5b;hpb=33157b200cf17ea688c996d2b9683a442515bdc3;p=releng%2Fglobal-jjb.git

diff --git a/jjb/lf-rtd-jobs.yaml b/jjb/lf-rtd-jobs.yaml
index cb044d9b..9f686e2a 100644
--- a/jjb/lf-rtd-jobs.yaml
+++ b/jjb/lf-rtd-jobs.yaml
@@ -1,17 +1,4 @@
 ---
-- job-group:
-    name: '{project-name}-rtd-jobs'
-
-    jobs:
-      - gerrit-rtd-merge
-      - gerrit-rtd-verify
-
-- job-group:
-    name: '{project-name}-github-rtd-jobs'
-
-    jobs:
-      - github-rtd-merge
-      - github-rtd-verify
 
 ####################
 # COMMON FUNCTIONS #
@@ -58,7 +45,6 @@
           branch: '{branch}'
           refspec: 'refs/heads/{branch}'
           stream: '{stream}'
-          lftools-version: '{lftools-version}'
 
     wrappers:
       - lf-infra-wrappers:
@@ -82,6 +68,7 @@
     branch: master
     build-days-to-keep: 7
     build-timeout: 15
+    disable-job: false
     git-url: https://github.com
     github-url: 'https://github.com'
     project-pattern: '**'
@@ -92,12 +79,16 @@
       - change-merged-event
       - comment-added-contains-event:
           comment-contains-value: remerge$
+      - ref-updated-event
 
     #####################
     # Job Configuration #
     #####################
 
+    disabled: '{disable-job}'
+
     builders:
+      - lf-infra-pre-build
       - lf-rtd-trigger-build:
           rtd-build-url: '{rtd-build-url}'
           rtd-token: '{rtd-token}'
@@ -119,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:
@@ -143,13 +136,15 @@
           trigger-phrase: '^remerge$'
           only-trigger-phrase: true
           status-context: 'RTD Merge'
-          permit-all: false
+          permit-all: true
           github-hooks: true
           org-list:
             - '{github-org}'
           white-list: '{obj:github_pr_whitelist}'
           admin-list: '{obj:github_pr_admin_list}'
           included-regions: '{obj:github_included_regions}'
+          white-list-target-branches:
+            - '{branch}'
 
 #############
 # RTD VERIFY#
@@ -165,12 +160,15 @@
     branch: master
     build-days-to-keep: 7
     build-timeout: 15
+    disable-job: false
     doc-dir: docs/_build/html
     git-url: '$GIT_URL/$PROJECT'
     github-url: 'https://github.com'
     project-pattern: '**'
     stream: master
     submodule-recursive: true
+    submodule-timeout: 10
+    gerrit-skip-vote: false
 
     gerrit_verify_triggers:
       - patchset-created-event:
@@ -185,7 +183,10 @@
     # Job Configuration #
     #####################
 
+    disabled: '{disable-job}'
+
     builders:
+      - lf-infra-pre-build
       - lf-rtd-verify:
           doc-dir: '{doc-dir}'
 
@@ -204,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:
@@ -217,6 +219,11 @@
                 - branch-compare-type: 'ANT'
                   branch-pattern: '**/{branch}'
               file-paths: '{obj:gerrit_trigger_file_paths}'
+          skip-vote:
+            successful: '{gerrit-skip-vote}'
+            failed: '{gerrit-skip-vote}'
+            unstable: '{gerrit-skip-vote}'
+            notbuilt: '{gerrit-skip-vote}'
 
 - job-template:
     name: '{project-name}-rtd-verify-{stream}'
@@ -238,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}'
 
@@ -249,3 +257,5 @@
           permit-all: true
           github-hooks: true
           included-regions: '{obj:github_included_regions}'
+          white-list-target-branches:
+            - '{branch}'