From: Thanh Ha <thanh.ha@linuxfoundation.org>
Date: Mon, 16 Oct 2017 02:56:06 +0000 (-0400)
Subject: Convert packer file-paths cfg to {obj:var}
X-Git-Tag: v0.11.0~14^2
X-Git-Url: https://gerrit.linuxfoundation.org/infra/gitweb?a=commitdiff_plain;h=refs%2Fchanges%2F99%2F6899%2F2;p=releng%2Fglobal-jjb.git

Convert packer file-paths cfg to {obj:var}

This is a standard we are using in most jobs so let's follow it with the
CI jobs as well. Looks like the packer jobs were already documented for
this but never actually implemented the feature.

The merge job unfortunately cannot be converted to the format due to
it's use of {platform} and {template} variables unless we want to make
it use the same file-paths as the verify job is now using.

Change-Id: Ie2976506e109f0e90ae26b4b6e4492d6b112b73a
Signed-off-by: Thanh Ha <thanh.ha@linuxfoundation.org>
---

diff --git a/jjb/lf-ci-jobs.yaml b/jjb/lf-ci-jobs.yaml
index b0d699ac..a83d87a0 100644
--- a/jjb/lf-ci-jobs.yaml
+++ b/jjb/lf-ci-jobs.yaml
@@ -72,19 +72,6 @@
             - file-id: jjbini-sandbox
               target: '$HOME/.config/jenkins_jobs/jenkins_jobs.ini'
 
-- lf_packer_verify_file_paths: &lf_packer_verify_file_paths
-    name: lf-packer-verify-file-paths
-    file-paths:
-      # Common files for all projects
-      - compare-type: ANT
-        pattern: 'packer/vars/**.json'
-      - compare-type: ANT
-        pattern: 'packer/templates/**.json'
-      - compare-type: ANT
-        pattern: 'packer/provision/**.sh'
-      - compare-type: ANT
-        pattern: 'packer/provision/lib/**'
-
 - lf_packer_file_paths: &lf_packer_file_paths
     name: lf-packer-file-paths
     file-paths:
@@ -682,9 +669,6 @@
     #         (default: true)
     #
     #     :gerrit_verify_triggers: Override Gerrit Triggers.
-    #     :gerrit_trigger_file_paths: Override file paths which can be used to
-    #         filter which file modifications will trigger a build.
-    #         (default defined by lf_jjb_common)
 
     ######################
     # Default parameters #
@@ -809,7 +793,6 @@
     #     :gerrit_verify_triggers: Override Gerrit Triggers.
     #     :gerrit_trigger_file_paths: Override file paths which can be used to
     #         filter which file modifications will trigger a build.
-    #         (default defined by lf_jjb_common)
 
     ######################
     # Default parameters #
@@ -826,6 +809,16 @@
       - comment-added-contains-event:
           comment-contains-value: recheck$
 
+    gerrit_trigger_file_paths:
+      - compare-type: ANT
+        pattern: 'packer/vars/**.json'
+      - compare-type: ANT
+        pattern: 'packer/templates/**.json'
+      - compare-type: ANT
+        pattern: 'packer/provision/**.sh'
+      - compare-type: ANT
+        pattern: 'packer/provision/lib/**'
+
     #####################
     # Job Configuration #
     #####################
@@ -865,7 +858,7 @@
               branches:
                 - branch-compare-type: ANT
                   branch-pattern: '**/{branch}'
-              <<: *lf_packer_verify_file_paths
+              file-paths: '{obj:gerrit_trigger_file_paths}'
 
 - job-template:
     name: '{project-name}-packer-verify'