X-Git-Url: https://gerrit.linuxfoundation.org/infra/gitweb?a=blobdiff_plain;f=.jjb-test%2Fexpected-xml%2Fgerrit-ciman-packer-merge-ubuntu1604-java-builder;h=ebcd8ae4b35a5029190217a51424df0dd9523284;hb=refs%2Fchanges%2F91%2F8391%2F1;hp=f7461288f9a56904819a2d66f7c767184ece5c5b;hpb=aac0a15221c201d497ece89a9f0637433c3cc79b;p=releng%2Fglobal-jjb.git 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 f7461288..ebcd8ae4 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 @@ -387,7 +387,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 @@ -692,7 +692,7 @@ rm ~/.netrc - 45 + 90 BUILD_TIMEOUT true false