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=12f74aaba4b6319c265a6770802280197d8ae024;hb=refs%2Fchanges%2F94%2F8394%2F1;hp=a91e2865c2a27a4e83fe6146e9f7cdbc00686753;hpb=aac0a15221c201d497ece89a9f0637433c3cc79b;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 a91e2865..12f74aab 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 @@ -345,7 +345,7 @@ mkdir -p "$PACKER_LOGS_DIR" export PATH="${WORKSPACE}/bin:$PATH" # Prioritize the project's own version of vars if available -platform_file="vars/$PACKER_PLATFORM.json" +platform_file="common-packer/vars/$PACKER_PLATFORM.json" if [ -f "$PACKER_PLATFORM" ]; then platform_file="vars/$PACKER_PLATFORM.json" fi @@ -650,7 +650,7 @@ rm ~/.netrc - 45 + 90 BUILD_TIMEOUT true false