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

diff --git a/jjb/lf-rtd-jobs.yaml b/jjb/lf-rtd-jobs.yaml
index 2b7ae8a7..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 #
@@ -25,10 +12,21 @@
     ######################
 
     gerrit_trigger_file_paths:
-      - compare-type: ANT
-        pattern: '**/*.rst'
-      - compare-type: ANT
-        pattern: '**/conf.py'
+      - compare-type: REG_EXP
+        pattern: '.*\.css'
+      - compare-type: REG_EXP
+        pattern: '.*\.html'
+      - compare-type: REG_EXP
+        pattern: '.*\.rst'
+      - compare-type: REG_EXP
+        pattern: '.*\/conf.py'
+
+    # github_included_regions MUST match gerrit_trigger_file_paths
+    github_included_regions:
+      - '.*\.css'
+      - '.*\.html'
+      - '.*\.rst'
+      - '.*\/conf.py'
 
     #####################
     # Job Configuration #
@@ -47,7 +45,6 @@
           branch: '{branch}'
           refspec: 'refs/heads/{branch}'
           stream: '{stream}'
-          lftools-version: '{lftools-version}'
 
     wrappers:
       - lf-infra-wrappers:
@@ -71,7 +68,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
@@ -80,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}'
@@ -107,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:
@@ -117,22 +122,29 @@
     <<: *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:
-      - lf-infra-github-pr-trigger:
+      - timed: 'H H * * *'
+      - github
+      - pollscm:
+          cron: ''
+      - github-pull-request:
           trigger-phrase: '^remerge$'
-          only-trigger-phrase: false
+          only-trigger-phrase: true
           status-context: 'RTD Merge'
           permit-all: true
           github-hooks: true
-          github-org: ''
-          github_pr_whitelist:
-            - ''
-          github_pr_admin_list:
-            - ''
-      - timed: 'H H * * *'
+          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#
@@ -148,11 +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:
@@ -161,13 +177,16 @@
           exclude-no-code-change: false
       - draft-published-event
       - comment-added-contains-event:
-          comment-contains-value: recheck$
+          comment-contains-value: '^Patch Set[ ]+[0-9]+:([ ]+|[\n]+)(recheck|reverify)$'
 
     #####################
     # Job Configuration #
     #####################
 
+    disabled: '{disable-job}'
+
     builders:
+      - lf-infra-pre-build
       - lf-rtd-verify:
           doc-dir: '{doc-dir}'
 
@@ -186,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:
@@ -199,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}'
@@ -209,8 +234,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:
@@ -218,18 +245,17 @@
           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}'
 
     triggers:
-      - lf-infra-github-pr-trigger:
-          trigger-phrase: '^recheck$'
+      - github-pull-request:
+          trigger-phrase: '^(recheck|reverify)$'
           only-trigger-phrase: false
           status-context: 'RTD Verify'
           permit-all: true
           github-hooks: true
-          github-org: ''
-          github_pr_whitelist:
-            - ''
-          github_pr_admin_list:
-            - ''
+          included-regions: '{obj:github_included_regions}'
+          white-list-target-branches:
+            - '{branch}'