X-Git-Url: https://gerrit.linuxfoundation.org/infra/gitweb?a=blobdiff_plain;f=.jjb-test%2Fexpected-xml%2Fgithub-ciman-packer-merge-centos-mininet;h=9ec70a2995dce9991f14e3fa2d773d66951f02d6;hb=7b93f6b4bae8c996e38dbab01a1a129b8dbfd47d;hp=6ead30f2fd71610d3f5e76eaba3a280c3ec2d52f;hpb=43a8f1147f4fecd2a10a4dcc4c943da4f7c3be56;p=releng%2Fglobal-jjb.git 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..9ec70a29 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 @@ -649,7 +650,7 @@ rm ~/.netrc - 45 + 90 BUILD_TIMEOUT true false