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 <thanh.ha@linuxfoundation.org>

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 0e9facd..0a8db2e 100644 (file)
--- 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 fa279e7..f27ac72 100644 (file)
--- 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 8896ec7..f746128 100644 (file)
--- 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 6814aba..7e1f72f 100644 (file)
--- 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 6e846d0..bb6ead1 100644 (file)
--- 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 16b8557..b6b3122 100644 (file)
--- 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 6ead30f..b9a3ac6 100644 (file)
--- 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 903976c..a91e286 100644 (file)
--- 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 b3380b4..936fe72 100644 (file)
--- 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 fd1dcb3..67b3ab6 100644 (file)
--- 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 dff5397..61e1431 100644 (file)
--- 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