X-Git-Url: https://gerrit.linuxfoundation.org/infra/gitweb?a=blobdiff_plain;f=jjb%2Flf-rtd-jobs.yaml;h=7101ae852e827d47db51609d8353b9dfc00988a6;hb=9fdb611f1fce34d54be1af81d7baedb86726302c;hp=16409187bfd56e4af77b98a16d0e3ac1106f4037;hpb=9cb04c8a479acc4e67891bdf425c62afae7445fa;p=releng%2Fglobal-jjb.git

diff --git a/jjb/lf-rtd-jobs.yaml b/jjb/lf-rtd-jobs.yaml
index 16409187..7101ae85 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 #
@@ -101,6 +88,7 @@
     disabled: '{disable-job}'
 
     builders:
+      - lf-infra-pre-build
       - lf-rtd-trigger-build:
           rtd-build-url: '{rtd-build-url}'
           rtd-token: '{rtd-token}'
@@ -177,6 +165,8 @@
     project-pattern: '**'
     stream: master
     submodule-recursive: true
+    submodule-timeout: 10
+    gerrit-skip-vote: false
 
     gerrit_verify_triggers:
       - patchset-created-event:
@@ -194,6 +184,7 @@
     disabled: '{disable-job}'
 
     builders:
+      - lf-infra-pre-build
       - lf-rtd-verify:
           doc-dir: '{doc-dir}'
 
@@ -212,6 +203,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:
@@ -225,6 +217,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}'
@@ -246,6 +243,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}'