From 8cc91c0eadaa2b39f54fc5d679b0ea70aae13627 Mon Sep 17 00:00:00 2001 From: Thanh Ha Date: Tue, 9 Jan 2018 12:49:21 -0500 Subject: [PATCH] Update packer file_path triggers Changes to migrate our scripts to ansible now requires us to update these filepath triggers. Issue: RELENG-288 Change-Id: I82e457aa2453c6446e30ddb9c567ecd8ad71878c Signed-off-by: Thanh Ha --- .../expected-xml/gerrit-ciman-packer-merge-centos-java-builder | 6 +++++- .jjb-test/expected-xml/gerrit-ciman-packer-merge-centos-mininet | 6 +++++- .../expected-xml/gerrit-ciman-packer-merge-ubuntu1604-java-builder | 6 +++++- .jjb-test/expected-xml/gerrit-ciman-packer-merge-ubuntu1604-mininet | 6 +++++- jjb/lf-ci-jobs.yaml | 5 +++-- 5 files changed, 23 insertions(+), 6 deletions(-) diff --git a/.jjb-test/expected-xml/gerrit-ciman-packer-merge-centos-java-builder b/.jjb-test/expected-xml/gerrit-ciman-packer-merge-centos-java-builder index e066ffa1..a6cdee46 100644 --- a/.jjb-test/expected-xml/gerrit-ciman-packer-merge-centos-java-builder +++ b/.jjb-test/expected-xml/gerrit-ciman-packer-merge-centos-java-builder @@ -151,7 +151,11 @@ For example '<1.0.0' or '>=1.0.0,<2.0.0'. ANT - packer/provision/java-builder.sh + packer/provision/*.sh + + + ANT + packer/provision/java-builder.yaml ANT diff --git a/.jjb-test/expected-xml/gerrit-ciman-packer-merge-centos-mininet b/.jjb-test/expected-xml/gerrit-ciman-packer-merge-centos-mininet index e4400dcf..37c42975 100644 --- a/.jjb-test/expected-xml/gerrit-ciman-packer-merge-centos-mininet +++ b/.jjb-test/expected-xml/gerrit-ciman-packer-merge-centos-mininet @@ -151,7 +151,11 @@ For example '<1.0.0' or '>=1.0.0,<2.0.0'. ANT - packer/provision/mininet.sh + packer/provision/*.sh + + + ANT + packer/provision/mininet.yaml ANT diff --git a/.jjb-test/expected-xml/gerrit-ciman-packer-merge-ubuntu1604-java-builder b/.jjb-test/expected-xml/gerrit-ciman-packer-merge-ubuntu1604-java-builder index 8501cc4b..27ec9901 100644 --- a/.jjb-test/expected-xml/gerrit-ciman-packer-merge-ubuntu1604-java-builder +++ b/.jjb-test/expected-xml/gerrit-ciman-packer-merge-ubuntu1604-java-builder @@ -151,7 +151,11 @@ For example '<1.0.0' or '>=1.0.0,<2.0.0'. ANT - packer/provision/java-builder.sh + packer/provision/*.sh + + + ANT + packer/provision/java-builder.yaml ANT diff --git a/.jjb-test/expected-xml/gerrit-ciman-packer-merge-ubuntu1604-mininet b/.jjb-test/expected-xml/gerrit-ciman-packer-merge-ubuntu1604-mininet index 7d48502d..305d010a 100644 --- a/.jjb-test/expected-xml/gerrit-ciman-packer-merge-ubuntu1604-mininet +++ b/.jjb-test/expected-xml/gerrit-ciman-packer-merge-ubuntu1604-mininet @@ -151,7 +151,11 @@ For example '<1.0.0' or '>=1.0.0,<2.0.0'. ANT - packer/provision/mininet.sh + packer/provision/*.sh + + + ANT + packer/provision/mininet.yaml ANT diff --git a/jjb/lf-ci-jobs.yaml b/jjb/lf-ci-jobs.yaml index c931f771..7aba0844 100644 --- a/jjb/lf-ci-jobs.yaml +++ b/jjb/lf-ci-jobs.yaml @@ -58,13 +58,14 @@ - lf_packer_file_paths: &lf_packer_file_paths name: lf-packer-file-paths file-paths: - # Common files for all projects - compare-type: ANT pattern: 'packer/vars/{platforms}.json' - compare-type: ANT pattern: 'packer/templates/{templates}.json' - compare-type: ANT - pattern: 'packer/provision/{templates}.sh' + pattern: 'packer/provision/*.sh' + - compare-type: ANT + pattern: 'packer/provision/{templates}.yaml' - compare-type: ANT pattern: 'packer/provision/lib/**' -- 2.16.6