From: Andrew Grimberg <agrimberg@linuxfoundation.org>
Date: Fri, 13 Oct 2017 20:38:21 +0000 (-0700)
Subject: Fix packer verify file path triggering
X-Git-Tag: v0.10.0~14
X-Git-Url: https://gerrit.linuxfoundation.org/infra/gitweb?a=commitdiff_plain;h=refs%2Fchanges%2F60%2F6860%2F2;p=releng%2Fglobal-jjb.git

Fix packer verify file path triggering

Packer verifies are not properly triggering because the generated ANT
paths are non-resolvable

Change-Id: I3938ca653ab0fba7190ea8caf3715bf7757be4f7
Signed-off-by: Andrew Grimberg <agrimberg@linuxfoundation.org>
---

diff --git a/.jjb-test/expected-xml/gerrit-ciman-packer-verify b/.jjb-test/expected-xml/gerrit-ciman-packer-verify
index ccbb1798..330c64c1 100644
--- a/.jjb-test/expected-xml/gerrit-ciman-packer-verify
+++ b/.jjb-test/expected-xml/gerrit-ciman-packer-verify
@@ -140,15 +140,15 @@ For example '&lt;1.0.0' or '&gt;=1.0.0,&lt;2.0.0'.
           <filePaths>
             <com.sonyericsson.hudson.plugins.gerrit.trigger.hudsontrigger.data.FilePath>
               <compareType>ANT</compareType>
-              <pattern>packer/vars/['centos', 'ubuntu1604'].json</pattern>
+              <pattern>packer/vars/**.json</pattern>
             </com.sonyericsson.hudson.plugins.gerrit.trigger.hudsontrigger.data.FilePath>
             <com.sonyericsson.hudson.plugins.gerrit.trigger.hudsontrigger.data.FilePath>
               <compareType>ANT</compareType>
-              <pattern>packer/templates/['java-builder', 'mininet'].json</pattern>
+              <pattern>packer/templates/**.json</pattern>
             </com.sonyericsson.hudson.plugins.gerrit.trigger.hudsontrigger.data.FilePath>
             <com.sonyericsson.hudson.plugins.gerrit.trigger.hudsontrigger.data.FilePath>
               <compareType>ANT</compareType>
-              <pattern>packer/provision/['java-builder', 'mininet'].sh</pattern>
+              <pattern>packer/provision/**.sh</pattern>
             </com.sonyericsson.hudson.plugins.gerrit.trigger.hudsontrigger.data.FilePath>
             <com.sonyericsson.hudson.plugins.gerrit.trigger.hudsontrigger.data.FilePath>
               <compareType>ANT</compareType>
diff --git a/jjb/lf-ci-jobs.yaml b/jjb/lf-ci-jobs.yaml
index 479e3c01..b0d699ac 100644
--- a/jjb/lf-ci-jobs.yaml
+++ b/jjb/lf-ci-jobs.yaml
@@ -72,6 +72,19 @@
             - 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:
@@ -852,7 +865,7 @@
               branches:
                 - branch-compare-type: ANT
                   branch-pattern: '**/{branch}'
-              <<: *lf_packer_file_paths
+              <<: *lf_packer_verify_file_paths
 
 - job-template:
     name: '{project-name}-packer-verify'