X-Git-Url: https://gerrit.linuxfoundation.org/infra/gitweb?a=blobdiff_plain;f=jjb%2Flf-ci-jobs.yaml;h=233fec46771de94a01e61b55e54b0e8d8dfae077;hb=f6db87032271817f546f6c1668138681529d7d3e;hp=d2a8f5ea2c1863477c8f8f9a9dc9da550d41f207;hpb=f492626a44e6b6baf93ab9259547b9af0500e52d;p=releng%2Fglobal-jjb.git

diff --git a/jjb/lf-ci-jobs.yaml b/jjb/lf-ci-jobs.yaml
index d2a8f5ea..233fec46 100644
--- a/jjb/lf-ci-jobs.yaml
+++ b/jjb/lf-ci-jobs.yaml
@@ -79,6 +79,7 @@
 
     branch: master
     build-timeout: 90
+    cron: '@monthly'
     stream: master
     submodule-recursive: true
     packer-cloud-settings: packer-cloud-env
@@ -143,8 +144,12 @@
     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
@@ -367,8 +372,8 @@
     scm:
       - lf-infra-github-scm:
           url: '{git-clone-url}{github-org}/{project}'
-          refspec: '+refs/pull/*:refs/remotes/origin/pr/*'
-          branch: '$sha1'
+          refspec: ''
+          branch: 'refs/heads/{branch}'
           submodule-recursive: true
           choosing-strategy: default
           jenkins-ssh-credential: '{jenkins-ssh-credential}'
@@ -461,10 +466,10 @@
           trigger-on: '{obj:gerrit_jjb_deploy_job_triggers}'
           projects:
             - project-compare-type: ANT
-              project-pattern: '{project}'
+              project-pattern: '**'
               branches:
                 - branch-compare-type: ANT
-                  branch-pattern: '**/{branch}'
+                  branch-pattern: '**'
           skip-vote:
             success: true
             failed: true
@@ -527,6 +532,7 @@
       - shell: !include-raw-escape:
           - ../shell/jjb-install.sh
           - ../shell/jjb-merge-job.sh
+          - ../shell/jjb-cleanup.sh
 
 - job-template:
     name: '{project-name}-jjb-merge'
@@ -625,6 +631,7 @@
           - ../shell/jjb-install.sh
           - ../shell/jjb-verify-job.sh
           - ../shell/jjb-check-unicode.sh
+          - ../shell/jjb-cleanup.sh
       - lf-infra-gpg-verify-git-signature
 
 - job-template:
@@ -739,7 +746,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}'
@@ -772,7 +779,7 @@
           jenkins-ssh-credential: '{jenkins-ssh-credential}'
 
     triggers:
-      - timed: '00 10 1 * *'
+      - timed: '{cron}'
       - github
       - pollscm:
           cron: ''