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=8bacaf67000180245721363de6f699c32ee5da35;hp=8896ec7a63255803ca3b72b9ded32187c3fd82a2;hpb=43a8f1147f4fecd2a10a4dcc4c943da4f7c3be56;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 8896ec7a..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
@@ -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
 
@@ -386,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
@@ -691,7 +692,7 @@ rm ~/.netrc
   <buildWrappers>
     <com.michelin.cio.hudson.plugins.maskpasswords.MaskPasswordsBuildWrapper/>
     <hudson.plugins.build__timeout.BuildTimeoutWrapper>
-      <timeoutMinutes>45</timeoutMinutes>
+      <timeoutMinutes>90</timeoutMinutes>
       <timeoutEnvVar>BUILD_TIMEOUT</timeoutEnvVar>
       <failBuild>true</failBuild>
       <writingDescription>false</writingDescription>