From a86335269012292fa055c6274898c342f44ba29d Mon Sep 17 00:00:00 2001 From: Andrew Grimberg Date: Fri, 13 Oct 2017 13:38:21 -0700 Subject: [PATCH] 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 --- .jjb-test/expected-xml/gerrit-ciman-packer-verify | 6 +++--- jjb/lf-ci-jobs.yaml | 15 ++++++++++++++- 2 files changed, 17 insertions(+), 4 deletions(-) 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 '<1.0.0' or '>=1.0.0,<2.0.0'. ANT - packer/vars/['centos', 'ubuntu1604'].json + packer/vars/**.json ANT - packer/templates/['java-builder', 'mininet'].json + packer/templates/**.json ANT - packer/provision/['java-builder', 'mininet'].sh + packer/provision/**.sh ANT 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' -- 2.16.6