From aac0a15221c201d497ece89a9f0637433c3cc79b Mon Sep 17 00:00:00 2001 From: Thanh Ha Date: Fri, 12 Jan 2018 16:18:03 -0500 Subject: [PATCH] Add a check for missing vars/*.json If a project does not have any then we should detect it and skip trying to parse those files. Change-Id: I9fd1fee88a68e745709779de9fec3f2013b7483f Signed-off-by: Thanh Ha --- .jjb-test/expected-xml/gerrit-ciman-packer-merge-centos-java-builder | 5 +++-- .jjb-test/expected-xml/gerrit-ciman-packer-merge-centos-mininet | 5 +++-- .../expected-xml/gerrit-ciman-packer-merge-ubuntu1604-java-builder | 5 +++-- .jjb-test/expected-xml/gerrit-ciman-packer-merge-ubuntu1604-mininet | 5 +++-- .jjb-test/expected-xml/gerrit-ciman-packer-verify | 5 +++-- .jjb-test/expected-xml/github-ciman-packer-merge-centos-java-builder | 5 +++-- .jjb-test/expected-xml/github-ciman-packer-merge-centos-mininet | 5 +++-- .../expected-xml/github-ciman-packer-merge-ubuntu1604-java-builder | 5 +++-- .jjb-test/expected-xml/github-ciman-packer-merge-ubuntu1604-mininet | 5 +++-- .jjb-test/expected-xml/github-ciman-packer-verify | 5 +++-- shell/packer-validate.sh | 5 +++-- 11 files changed, 33 insertions(+), 22 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 0e9facd8..0a8db2e7 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 @@ -271,8 +271,9 @@ templates=(templates/*.json) for varfile in "${varfiles[@]}"; do # cloud-env.json is a file containing credentials which is pulled in via - # CLOUDENV variable so skip it here. - if [[ "$varfile" == *"cloud-env.json"* ]]; then + # CLOUDENV variable so skip it here. Also handle the case where a project + # has not vars/*.json file. + if [[ "$varfile" == *"cloud-env.json"* ]] || [[ "$varfile" == 'vars/*.json' ]]; then continue fi 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 fa279e76..f27ac729 100644 --- a/.jjb-test/expected-xml/gerrit-ciman-packer-merge-centos-mininet +++ b/.jjb-test/expected-xml/gerrit-ciman-packer-merge-centos-mininet @@ -271,8 +271,9 @@ templates=(templates/*.json) for varfile in "${varfiles[@]}"; do # cloud-env.json is a file containing credentials which is pulled in via - # CLOUDENV variable so skip it here. - if [[ "$varfile" == *"cloud-env.json"* ]]; then + # CLOUDENV variable so skip it here. Also handle the case where a project + # has not vars/*.json file. + if [[ "$varfile" == *"cloud-env.json"* ]] || [[ "$varfile" == 'vars/*.json' ]]; then continue fi 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 8896ec7a..f7461288 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 @@ -271,8 +271,9 @@ templates=(templates/*.json) for varfile in "${varfiles[@]}"; do # cloud-env.json is a file containing credentials which is pulled in via - # CLOUDENV variable so skip it here. - if [[ "$varfile" == *"cloud-env.json"* ]]; then + # CLOUDENV variable so skip it here. Also handle the case where a project + # has not vars/*.json file. + if [[ "$varfile" == *"cloud-env.json"* ]] || [[ "$varfile" == 'vars/*.json' ]]; then continue fi 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 6814aba4..7e1f72f8 100644 --- a/.jjb-test/expected-xml/gerrit-ciman-packer-merge-ubuntu1604-mininet +++ b/.jjb-test/expected-xml/gerrit-ciman-packer-merge-ubuntu1604-mininet @@ -271,8 +271,9 @@ templates=(templates/*.json) for varfile in "${varfiles[@]}"; do # cloud-env.json is a file containing credentials which is pulled in via - # CLOUDENV variable so skip it here. - if [[ "$varfile" == *"cloud-env.json"* ]]; then + # CLOUDENV variable so skip it here. Also handle the case where a project + # has not vars/*.json file. + if [[ "$varfile" == *"cloud-env.json"* ]] || [[ "$varfile" == 'vars/*.json' ]]; then continue fi diff --git a/.jjb-test/expected-xml/gerrit-ciman-packer-verify b/.jjb-test/expected-xml/gerrit-ciman-packer-verify index 6e846d05..bb6ead14 100644 --- a/.jjb-test/expected-xml/gerrit-ciman-packer-verify +++ b/.jjb-test/expected-xml/gerrit-ciman-packer-verify @@ -269,8 +269,9 @@ templates=(templates/*.json) for varfile in "${varfiles[@]}"; do # cloud-env.json is a file containing credentials which is pulled in via - # CLOUDENV variable so skip it here. - if [[ "$varfile" == *"cloud-env.json"* ]]; then + # CLOUDENV variable so skip it here. Also handle the case where a project + # has not vars/*.json file. + if [[ "$varfile" == *"cloud-env.json"* ]] || [[ "$varfile" == 'vars/*.json' ]]; then continue fi diff --git a/.jjb-test/expected-xml/github-ciman-packer-merge-centos-java-builder b/.jjb-test/expected-xml/github-ciman-packer-merge-centos-java-builder index 16b85577..b6b31220 100644 --- a/.jjb-test/expected-xml/github-ciman-packer-merge-centos-java-builder +++ b/.jjb-test/expected-xml/github-ciman-packer-merge-centos-java-builder @@ -229,8 +229,9 @@ templates=(templates/*.json) for varfile in "${varfiles[@]}"; do # cloud-env.json is a file containing credentials which is pulled in via - # CLOUDENV variable so skip it here. - if [[ "$varfile" == *"cloud-env.json"* ]]; then + # CLOUDENV variable so skip it here. Also handle the case where a project + # has not vars/*.json file. + if [[ "$varfile" == *"cloud-env.json"* ]] || [[ "$varfile" == 'vars/*.json' ]]; then continue fi diff --git a/.jjb-test/expected-xml/github-ciman-packer-merge-centos-mininet b/.jjb-test/expected-xml/github-ciman-packer-merge-centos-mininet index 6ead30f2..b9a3ac65 100644 --- a/.jjb-test/expected-xml/github-ciman-packer-merge-centos-mininet +++ b/.jjb-test/expected-xml/github-ciman-packer-merge-centos-mininet @@ -229,8 +229,9 @@ templates=(templates/*.json) for varfile in "${varfiles[@]}"; do # cloud-env.json is a file containing credentials which is pulled in via - # CLOUDENV variable so skip it here. - if [[ "$varfile" == *"cloud-env.json"* ]]; then + # CLOUDENV variable so skip it here. Also handle the case where a project + # has not vars/*.json file. + if [[ "$varfile" == *"cloud-env.json"* ]] || [[ "$varfile" == 'vars/*.json' ]]; then continue fi diff --git a/.jjb-test/expected-xml/github-ciman-packer-merge-ubuntu1604-java-builder b/.jjb-test/expected-xml/github-ciman-packer-merge-ubuntu1604-java-builder index 903976c6..a91e2865 100644 --- a/.jjb-test/expected-xml/github-ciman-packer-merge-ubuntu1604-java-builder +++ b/.jjb-test/expected-xml/github-ciman-packer-merge-ubuntu1604-java-builder @@ -229,8 +229,9 @@ templates=(templates/*.json) for varfile in "${varfiles[@]}"; do # cloud-env.json is a file containing credentials which is pulled in via - # CLOUDENV variable so skip it here. - if [[ "$varfile" == *"cloud-env.json"* ]]; then + # CLOUDENV variable so skip it here. Also handle the case where a project + # has not vars/*.json file. + if [[ "$varfile" == *"cloud-env.json"* ]] || [[ "$varfile" == 'vars/*.json' ]]; then continue fi diff --git a/.jjb-test/expected-xml/github-ciman-packer-merge-ubuntu1604-mininet b/.jjb-test/expected-xml/github-ciman-packer-merge-ubuntu1604-mininet index b3380b46..936fe727 100644 --- a/.jjb-test/expected-xml/github-ciman-packer-merge-ubuntu1604-mininet +++ b/.jjb-test/expected-xml/github-ciman-packer-merge-ubuntu1604-mininet @@ -229,8 +229,9 @@ templates=(templates/*.json) for varfile in "${varfiles[@]}"; do # cloud-env.json is a file containing credentials which is pulled in via - # CLOUDENV variable so skip it here. - if [[ "$varfile" == *"cloud-env.json"* ]]; then + # CLOUDENV variable so skip it here. Also handle the case where a project + # has not vars/*.json file. + if [[ "$varfile" == *"cloud-env.json"* ]] || [[ "$varfile" == 'vars/*.json' ]]; then continue fi diff --git a/.jjb-test/expected-xml/github-ciman-packer-verify b/.jjb-test/expected-xml/github-ciman-packer-verify index fd1dcb34..67b3ab64 100644 --- a/.jjb-test/expected-xml/github-ciman-packer-verify +++ b/.jjb-test/expected-xml/github-ciman-packer-verify @@ -217,8 +217,9 @@ templates=(templates/*.json) for varfile in "${varfiles[@]}"; do # cloud-env.json is a file containing credentials which is pulled in via - # CLOUDENV variable so skip it here. - if [[ "$varfile" == *"cloud-env.json"* ]]; then + # CLOUDENV variable so skip it here. Also handle the case where a project + # has not vars/*.json file. + if [[ "$varfile" == *"cloud-env.json"* ]] || [[ "$varfile" == 'vars/*.json' ]]; then continue fi diff --git a/shell/packer-validate.sh b/shell/packer-validate.sh index dff5397e..61e14313 100644 --- a/shell/packer-validate.sh +++ b/shell/packer-validate.sh @@ -26,8 +26,9 @@ templates=(templates/*.json) for varfile in "${varfiles[@]}"; do # cloud-env.json is a file containing credentials which is pulled in via - # CLOUDENV variable so skip it here. - if [[ "$varfile" == *"cloud-env.json"* ]]; then + # CLOUDENV variable so skip it here. Also handle the case where a project + # has not vars/*.json file. + if [[ "$varfile" == *"cloud-env.json"* ]] || [[ "$varfile" == 'vars/*.json' ]]; then continue fi -- 2.16.6