X-Git-Url: https://gerrit.linuxfoundation.org/infra/gitweb?a=blobdiff_plain;f=jjb%2Flf-ci-jobs.yaml;h=502b1cf65ff0de869bb7e6a5cba3948afb7dbf87;hb=c319a261f98875cb3effea29c477b05093db59b7;hp=e9e483ea70f65e7e8fbfa5cb11e1d9487fa8535f;hpb=b65f75f9185892ce5980ac40a8e4f0e4a332412c;p=releng%2Fglobal-jjb.git

diff --git a/jjb/lf-ci-jobs.yaml b/jjb/lf-ci-jobs.yaml
index e9e483ea..502b1cf6 100644
--- a/jjb/lf-ci-jobs.yaml
+++ b/jjb/lf-ci-jobs.yaml
@@ -110,9 +110,9 @@
       - compare-type: REG_EXP
         pattern: '.*\.ps1'
       - compare-type: REG_EXP
-        pattern: '.*\.(yaml|yml)'
+        pattern: 'jjb/.*'
       - compare-type: REG_EXP
-        pattern: '.*\/global-jjb'
+        pattern: 'global-jjb'
 
     # github_included_regions MUST match gerrit_trigger_file_paths
     github_included_regions:
@@ -120,8 +120,8 @@
       - '.*\.sh'
       - '.*\.bat'
       - '.*\.ps1'
-      - '.*\.(yaml|yml)'
-      - '.*\/global-jjb'
+      - 'jjb/.*'
+      - 'global-jjb'
 
     #####################
     # Job Configuration #
@@ -236,7 +236,7 @@
       - inject:
           properties-content: 'jenkins_silos={jenkins-silos}'
       - shell: !include-raw-escape: ../shell/jenkins-configure-clouds.sh
-      - shell: rm "$HOME/.config/jenkins_jobs/jenkins_jobs.ini"
+      - shell: rm -f "$HOME/.config/jenkins_jobs/jenkins_jobs.ini"
 
 - builder:
     name: lf-jenkins-cfg-global-vars
@@ -245,7 +245,7 @@
       - inject:
           properties-content: 'jenkins_silos={jenkins-silos}'
       - shell: !include-raw-escape: ../shell/jenkins-configure-global-vars.sh
-      - shell: rm "$HOME/.config/jenkins_jobs/jenkins_jobs.ini"
+      - shell: rm -f "$HOME/.config/jenkins_jobs/jenkins_jobs.ini"
 
 - lf_jenkins_configuration: &lf_jenkins_cfg_merge
     name: lf-jenkins-cfg-merge
@@ -301,8 +301,7 @@
           jenkins-ssh-credential: '{jenkins-ssh-credential}'
 
     builders:
-      - shell: !include-raw-escape:
-          - ../shell/lftools-install.sh
+      - lf-infra-pre-build
       - lf-jenkins-cfg-global-vars:
           jenkins-silos: '{jenkins-silos}'
       - lf-jenkins-cfg-clouds:
@@ -572,6 +571,7 @@
     #####################
 
     builders:
+      - lf-infra-pre-build
       - lf-infra-jjbini
       - shell: !include-raw-escape:
           - ../shell/jjb-install.sh
@@ -680,6 +680,7 @@
     concurrent: true
 
     builders:
+      - lf-infra-pre-build
       - lf-infra-jjbini
       - shell: !include-raw-escape:
           - ../shell/git-validate-jira-urls.sh