From f3cc72f4bd892c061eb1b5232ae13e44843d0224 Mon Sep 17 00:00:00 2001 From: Shubham Shinde Date: Fri, 13 Sep 2024 21:35:47 +0530 Subject: [PATCH] (PA-6543) Add more curl options when downloading WIX zip - The '--fail' options will return error code 1 if artifactory resource is not found. If not given, then for unsuccessful response from artifactory, the response is saved in the output file as html. Here, curl returns exit code 0 which is not interpreted as an error, so the build proceeds. The build then tries to unzip this html which throws an error that is rather difficult to debug. - The '--retry' flag will guard against transient failures if any. --- configs/platforms/windowsfips-2012r2-x64.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configs/platforms/windowsfips-2012r2-x64.rb b/configs/platforms/windowsfips-2012r2-x64.rb index 3c6e8f1462..9e8830a14f 100644 --- a/configs/platforms/windowsfips-2012r2-x64.rb +++ b/configs/platforms/windowsfips-2012r2-x64.rb @@ -14,7 +14,7 @@ #FIXME we need Fips Compliant Wix, currently not in choco repositories #plat.provision_with "C:/ProgramData/chocolatey/bin/choco.exe install -y Wix310 -version 3.10.2 -debug -x86 --no-progress" - plat.provision_with "curl -L -o /tmp/wix314-binaries.zip https://artifactory.delivery.puppetlabs.net/artifactory/generic__buildsources/buildsources/wix314-binaries.zip && \"C:/Program Files/7-Zip/7z.exe\" x -y -o\"C:/Program Files (x86)/WiX Toolset v3.14/bin\" C:/cygwin64/tmp/wix314-binaries.zip && rm /tmp/wix314-binaries.zip && SETX WIX \"C:\\Program Files (x86)\\WiX Toolset v3.14\" /M" + plat.provision_with "curl -L --fail --retry 3 -o /tmp/wix314-binaries.zip https://artifactory.delivery.puppetlabs.net/artifactory/generic__buildsources/buildsources/wix314-binaries.zip && \"C:/Program Files/7-Zip/7z.exe\" x -y -o\"C:/Program Files (x86)/WiX Toolset v3.14/bin\" C:/cygwin64/tmp/wix314-binaries.zip && rm /tmp/wix314-binaries.zip && SETX WIX \"C:\\Program Files (x86)\\WiX Toolset v3.14\" /M" plat.install_build_dependencies_with "C:/ProgramData/chocolatey/bin/choco.exe install -y --no-progress"