X-Git-Url: https://gerrit.linuxfoundation.org/infra/gitweb?a=blobdiff_plain;f=jjb%2Flf-ci-jobs.yaml;h=a01ce2bd0f7c084e97e9c2cf96ed9b5724562a61;hb=1446ca9ed6f9eab0f36a5a45f4b62a377341b7f5;hp=cc4399b97052c0a3b9c4074cca007b7613c5ce31;hpb=08453751efb9b2737b05a03c9f1925435478db8d;p=releng%2Fglobal-jjb.git

diff --git a/jjb/lf-ci-jobs.yaml b/jjb/lf-ci-jobs.yaml
index cc4399b9..a01ce2bd 100644
--- a/jjb/lf-ci-jobs.yaml
+++ b/jjb/lf-ci-jobs.yaml
@@ -63,6 +63,7 @@
 
     branch: master
     build-timeout: 90
+    cron: '@monthly'
     stream: master
     submodule-recursive: true
     packer-cloud-settings: packer-cloud-env
@@ -127,16 +128,21 @@
     submodule-recursive: true
 
     gerrit_trigger_file_paths:
-      - compare-type: ANT
-        pattern: '**/*.groovy'
-      - compare-type: ANT
-        pattern: '**/*.sh'
-      - compare-type: ANT
-        pattern: '**/*.yml'
-      - compare-type: ANT
-        pattern: '**/*.yaml'
-      - compare-type: ANT
-        pattern: '**/global-jjb'
+      - compare-type: REG_EXP
+        pattern: '.*\.groovy'
+      - compare-type: REG_EXP
+        pattern: '.*\.sh'
+      - compare-type: REG_EXP
+        pattern: '.*\.(yaml|yml)'
+      - compare-type: REG_EXP
+        pattern: '.*\/global-jjb'
+
+    # github_included_regions MUST match gerrit_trigger_file_paths
+    github_included_regions:
+      - '.*\.groovy'
+      - '.*\.sh'
+      - '.*\.(yaml|yml)'
+      - '.*\/global-jjb'
 
     #####################
     # Job Configuration #
@@ -277,8 +283,12 @@
           comment-contains-value: remerge$
 
     gerrit_trigger_file_paths:
-      - compare-type: ANT
-        pattern: 'jenkins-config/**'
+      - compare-type: REG_EXP
+        pattern: 'jenkins-config\/.*'
+
+    # github_included_regions MUST match gerrit_trigger_file_paths
+    github_included_regions:
+      - 'jenkins-config\/.*'
 
     #####################
     # Job Configuration #
@@ -366,16 +376,17 @@
       - github
       - pollscm:
           cron: ''
-      - lf-infra-github-pr-trigger:
+      - github-pull-request:
           trigger-phrase: '^remerge$'
           only-trigger-phrase: true
           status-context: 'Jenkins CFG Merge'
           permit-all: false
           github-hooks: true
-          github-org: '{github-org}'
-          github_pr_whitelist: '{obj:github_pr_whitelist}'
-          github_pr_admin_list: '{obj:github_pr_admin_list}'
-
+          org-list:
+            - '{github-org}'
+          white-list: '{obj:github_pr_whitelist}'
+          admin-list: '{obj:github_pr_admin_list}'
+          included-regions: '{obj:github_included_regions}'
 
 ##################
 # JJB DEPLOY JOB #
@@ -478,17 +489,12 @@
           jenkins-ssh-credential: '{jenkins-ssh-credential}'
 
     triggers:
-      - lf-infra-github-pr-trigger:
+      - github-pull-request:
           trigger-phrase: '^jjb-deploy (?!\*+$).+$'
           only-trigger-phrase: true
           status-context: 'JJB Deploy Job'
           permit-all: true
           github-hooks: true
-          github-org: ''
-          github_pr_whitelist:
-            - ''
-          github_pr_admin_list:
-            - ''
 
 #############
 # JJB Merge #
@@ -554,6 +560,10 @@
     # yamllint disable-line rule:key-duplicates
     <<: *lf_jjb_merge
 
+    #####################
+    # Job Configuration #
+    #####################
+
     properties:
       - github:
           url: '{git-url}/{github-org}/{project}'
@@ -571,15 +581,17 @@
       - github
       - pollscm:
           cron: ''
-      - lf-infra-github-pr-trigger:
+      - github-pull-request:
           trigger-phrase: '^remerge$'
           only-trigger-phrase: true
           status-context: 'JJB Merge'
           permit-all: false
           github-hooks: true
-          github-org: '{github-org}'
-          github_pr_whitelist: '{obj:github_pr_whitelist}'
-          github_pr_admin_list: '{obj:github_pr_admin_list}'
+          org-list:
+            - '{github-org}'
+          white-list: '{obj:github_pr_whitelist}'
+          admin-list: '{obj:github_pr_admin_list}'
+          included-regions: '{obj:github_included_regions}'
 
 ##############
 # JJB Verify #
@@ -624,8 +636,16 @@
     # yamllint disable-line rule:key-duplicates
     <<: *lf_jjb_verify
 
+    ######################
+    # Default parameters #
+    ######################
+
     git-url: '$GIT_URL/$GERRIT_PROJECT'
 
+    #####################
+    # Job Configuration #
+    #####################
+
     scm:
       - lf-infra-gerrit-scm:
           git-url: '{git-url}'
@@ -654,6 +674,10 @@
     # yamllint disable-line rule:key-duplicates
     <<: *lf_jjb_verify
 
+    #####################
+    # Job Configuration #
+    #####################
+
     properties:
       - github:
           url: '{git-url}/{github-org}/{project}'
@@ -668,17 +692,13 @@
           jenkins-ssh-credential: '{jenkins-ssh-credential}'
 
     triggers:
-      - lf-infra-github-pr-trigger:
+      - github-pull-request:
           trigger-phrase: '^recheck$'
           only-trigger-phrase: false
           status-context: 'JJB Verify'
           permit-all: true
           github-hooks: true
-          github-org: ''
-          github_pr_whitelist:
-            - ''
-          github_pr_admin_list:
-            - ''
+          included-regions: '{obj:github_included_regions}'
 
 ################
 # Packer Merge #
@@ -733,7 +753,7 @@
           jenkins-ssh-credential: '{jenkins-ssh-credential}'
 
     triggers:
-      - timed: '00 10 1 * *'
+      - timed: '{cron}'
       - gerrit:
           server-name: '{gerrit-server-name}'
           trigger-on: '{obj:gerrit_merge_triggers}'
@@ -780,7 +800,7 @@
           jenkins-ssh-credential: '{jenkins-ssh-credential}'
 
     triggers:
-      - timed: '00 10 1 * *'
+      - timed: '{cron}'
       - github
       - pollscm:
           cron: ''