X-Git-Url: https://gerrit.linuxfoundation.org/infra/gitweb?a=blobdiff_plain;f=jjb%2Flf-ci-jobs.yaml;h=668342a350ad2dd38173caf2239d7f638d7bb8a8;hb=ad6bd3d20148474280aa37718de557dda95de75b;hp=20382811143c385a011acddca159397ec147fae0;hpb=cddcc9d81a2fc6a28f691a2a02d88582f7284bf3;p=releng%2Fglobal-jjb.git

diff --git a/jjb/lf-ci-jobs.yaml b/jjb/lf-ci-jobs.yaml
index 20382811..668342a3 100644
--- a/jjb/lf-ci-jobs.yaml
+++ b/jjb/lf-ci-jobs.yaml
@@ -102,7 +102,7 @@
           stream: '{stream}'
           branch: '{branch}'
           lftools-version: '{lftools-version}'
-      - lf-infra-packer-parameters:
+      - lf-packer-parameters:
           packer-version: '{packer-version}'
 
     wrappers:
@@ -122,7 +122,7 @@
           description: Jenkins Job Builder version to download and install.
 
 - parameter:
-    name: lf-infra-packer-parameters
+    name: lf-packer-parameters
     parameters:
       - string:
           name: PACKER_VERSION
@@ -143,8 +143,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 +371,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 +465,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 +531,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 +630,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: