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

diff --git a/jjb/lf-rtd-jobs.yaml b/jjb/lf-rtd-jobs.yaml
index eb2382a3..16409187 100644
--- a/jjb/lf-rtd-jobs.yaml
+++ b/jjb/lf-rtd-jobs.yaml
@@ -82,7 +82,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,6 +98,8 @@
     # Job Configuration #
     #####################
 
+    disabled: '{disable-job}'
+
     builders:
       - lf-rtd-trigger-build:
           rtd-build-url: '{rtd-build-url}'
@@ -131,7 +135,7 @@
       - 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 * * *'
@@ -142,13 +146,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#
@@ -164,8 +170,10 @@
     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
@@ -183,6 +191,8 @@
     # Job Configuration #
     #####################
 
+    disabled: '{disable-job}'
+
     builders:
       - lf-rtd-verify:
           doc-dir: '{doc-dir}'
@@ -228,7 +238,7 @@
       - 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:
@@ -247,3 +257,5 @@
           permit-all: true
           github-hooks: true
           included-regions: '{obj:github_included_regions}'
+          white-list-target-branches:
+            - '{branch}'