X-Git-Url: https://gerrit.linuxfoundation.org/infra/gitweb?a=blobdiff_plain;f=.jjb-test%2Fexpected-xml%2Fgithub-ciman-packer-merge-ubuntu1604-java-builder;h=a91e2865c2a27a4e83fe6146e9f7cdbc00686753;hb=aac0a15221c201d497ece89a9f0637433c3cc79b;hp=903976c6a411a9b12655d175135b8b46586e00fb;hpb=43a8f1147f4fecd2a10a4dcc4c943da4f7c3be56;p=releng%2Fglobal-jjb.git 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