X-Git-Url: https://gerrit.linuxfoundation.org/infra/gitweb?a=blobdiff_plain;f=jjb%2Flf-rtd-jobs.yaml;h=0f4aa8ba4697ea7fbe8d4eb0fec88eaa11e6b2fb;hb=refs%2Fchanges%2F61%2F12861%2F3;hp=dd6301df64687199202a53d56e0077f4e8aae57d;hpb=0ccbbe044a37d03bb4d0a0bc18e6da592231e9b9;p=releng%2Fglobal-jjb.git

diff --git a/jjb/lf-rtd-jobs.yaml b/jjb/lf-rtd-jobs.yaml
index dd6301df..0f4aa8ba 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 #
@@ -82,7 +69,9 @@
     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: '**'
     stream: master
     submodule-recursive: true
@@ -96,7 +85,10 @@
     # Job Configuration #
     #####################
 
+    disabled: '{disable-job}'
+
     builders:
+      - lf-infra-pre-build
       - lf-rtd-trigger-build:
           rtd-build-url: '{rtd-build-url}'
           rtd-token: '{rtd-token}'
@@ -128,8 +120,10 @@
     <<: *lf_rtd_merge
 
     properties:
+      - lf-infra-properties:
+          build-days-to-keep: '{build-days-to-keep}'
       - github:
-          url: '{git-url}/{github-org}/{project}'
+          url: '{github-url}/{github-org}/{project}'
 
     triggers:
       - timed: 'H H * * *'
@@ -140,13 +134,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#
@@ -162,11 +158,14 @@
     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
+    gerrit-skip-vote: false
 
     gerrit_verify_triggers:
       - patchset-created-event:
@@ -181,7 +180,10 @@
     # Job Configuration #
     #####################
 
+    disabled: '{disable-job}'
+
     builders:
+      - lf-infra-pre-build
       - lf-rtd-verify:
           doc-dir: '{doc-dir}'
 
@@ -213,6 +215,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}'
@@ -223,8 +230,10 @@
     <<: *lf_rtd_verify
 
     properties:
+      - lf-infra-properties:
+          build-days-to-keep: '{build-days-to-keep}'
       - github:
-          url: '{git-url}/{github-org}/{project}'
+          url: '{github-url}/{github-org}/{project}'
 
     scm:
       - lf-infra-github-scm:
@@ -243,3 +252,5 @@
           permit-all: true
           github-hooks: true
           included-regions: '{obj:github_included_regions}'
+          white-list-target-branches:
+            - '{branch}'