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=9a1fd38a7d6b4e21c73ce488b727ad7bd7bb26d3;hpb=333d661d90ff0291664d49ea5de5866a0ed8b94d;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 9a1fd38a..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
@@ -96,28 +96,22 @@ For example '<1.0.0' or '>=1.0.0,<2.0.0'.
         <name>refs/heads/$GERRIT_BRANCH</name>
       </hudson.plugins.git.BranchSpec>
     </branches>
-    <excludedUsers/>
-    <buildChooser class="com.sonyericsson.hudson.plugins.gerrit.trigger.hudsontrigger.GerritTriggerBuildChooser"/>
     <doGenerateSubmoduleConfigurations>false</doGenerateSubmoduleConfigurations>
-    <authorOrCommitter>false</authorOrCommitter>
-    <wipeOutWorkspace>true</wipeOutWorkspace>
-    <pruneBranches>false</pruneBranches>
     <remotePoll>false</remotePoll>
     <gitTool>Default</gitTool>
     <submoduleCfg class="list"/>
-    <relativeTargetDir/>
     <reference/>
     <gitConfigName/>
     <gitConfigEmail/>
-    <skipTag>true</skipTag>
-    <scmName/>
-    <useShallowClone>false</useShallowClone>
-    <ignoreNotifyCommit>false</ignoreNotifyCommit>
     <extensions>
+      <hudson.plugins.git.extensions.impl.BuildChooserSetting>
+        <buildChooser class="com.sonyericsson.hudson.plugins.gerrit.trigger.hudsontrigger.GerritTriggerBuildChooser"/>
+      </hudson.plugins.git.extensions.impl.BuildChooserSetting>
       <hudson.plugins.git.extensions.impl.SubmoduleOption>
         <disableSubmodules>false</disableSubmodules>
         <recursiveSubmodules>true</recursiveSubmodules>
         <trackingSubmodules>false</trackingSubmodules>
+        <parentCredentials>false</parentCredentials>
         <reference/>
         <timeout>10</timeout>
       </hudson.plugins.git.extensions.impl.SubmoduleOption>
@@ -277,8 +271,9 @@ templates=(templates/*.json)
 
 for varfile in &quot;${varfiles[@]}&quot;; do
     # cloud-env.json is a file containing credentials which is pulled in via
-    # CLOUDENV variable so skip it here.
-    if [[ &quot;$varfile&quot; == *&quot;cloud-env.json&quot;* ]]; then
+    # CLOUDENV variable so skip it here. Also handle the case where a project
+    # has not vars/*.json file.
+    if [[ &quot;$varfile&quot; == *&quot;cloud-env.json&quot;* ]] || [[ &quot;$varfile&quot; == 'vars/*.json' ]]; then
         continue
     fi
 
@@ -392,7 +387,7 @@ mkdir -p &quot;$PACKER_LOGS_DIR&quot;
 export PATH=&quot;${WORKSPACE}/bin:$PATH&quot;
 
 # Prioritize the project's own version of vars if available
-platform_file=&quot;vars/$PACKER_PLATFORM.json&quot;
+platform_file=&quot;common-packer/vars/$PACKER_PLATFORM.json&quot;
 if [ -f &quot;$PACKER_PLATFORM&quot; ]; then
     platform_file=&quot;vars/$PACKER_PLATFORM.json&quot;
 fi
@@ -697,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>