From c6c08f80a175dd40eee5acd8f472e8d89dcf0e89 Mon Sep 17 00:00:00 2001 From: Ben Broderick Phillips Date: Tue, 10 Nov 2020 06:27:20 -0500 Subject: [PATCH 1/2] Add debug flag to arm deployment command --- eng/common/TestResources/New-TestResources.ps1 | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/eng/common/TestResources/New-TestResources.ps1 b/eng/common/TestResources/New-TestResources.ps1 index 4c03816c1284..c3fdb14e5ea8 100644 --- a/eng/common/TestResources/New-TestResources.ps1 +++ b/eng/common/TestResources/New-TestResources.ps1 @@ -385,7 +385,15 @@ foreach ($templateFile in $templateFiles) { Log "Deploying template '$templateFile' to resource group '$($resourceGroup.ResourceGroupName)'" $deployment = Retry { - New-AzResourceGroupDeployment -Name $BaseName -ResourceGroupName $resourceGroup.ResourceGroupName -TemplateFile $templateFile -TemplateParameterObject $templateFileParameters + $lastDebugPreference = $DebugPreference + try { + $DebugPreference = "Continue" + New-AzResourceGroupDeployment -Name $BaseName -ResourceGroupName $resourceGroup.ResourceGroupName -TemplateFile $templateFile -TemplateParameterObject $templateFileParameters + } catch { + throw $_ + } finally { + $DebugPreference = $lastDebugPreference + } } if ($deployment.ProvisioningState -eq 'Succeeded') { From b19cbb1c3c93a39f6adcbdde48ddf140b19b6208 Mon Sep 17 00:00:00 2001 From: Ben Broderick Phillips Date: Tue, 10 Nov 2020 08:58:27 -0500 Subject: [PATCH 2/2] Only set debug preference when $CI is true --- eng/common/TestResources/New-TestResources.ps1 | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/eng/common/TestResources/New-TestResources.ps1 b/eng/common/TestResources/New-TestResources.ps1 index c3fdb14e5ea8..3d3f95b561a4 100644 --- a/eng/common/TestResources/New-TestResources.ps1 +++ b/eng/common/TestResources/New-TestResources.ps1 @@ -308,7 +308,7 @@ if ($CI) { if ($EnvironmentVariables.ContainsKey('AZURE_RESOURCEGROUP_NAME') -and ` $EnvironmentVariables['AZURE_RESOURCEGROUP_NAME'] -ne $ResourceGroupName) { - Write-Warning ("Overwriting 'EnvironmentVariables.AZURE_RESOURCEGROUP_NAME' with value " + + Write-Warning ("Overwriting 'EnvironmentVariables.AZURE_RESOURCEGROUP_NAME' with value " + "'$($EnvironmentVariables['AZURE_RESOURCEGROUP_NAME'])' " + "to new value '$($ResourceGroupName)'") } $EnvironmentVariables['AZURE_RESOURCEGROUP_NAME'] = $ResourceGroupName @@ -387,10 +387,10 @@ foreach ($templateFile in $templateFiles) { $deployment = Retry { $lastDebugPreference = $DebugPreference try { - $DebugPreference = "Continue" + if ($CI) { + $DebugPreference = "Continue" + } New-AzResourceGroupDeployment -Name $BaseName -ResourceGroupName $resourceGroup.ResourceGroupName -TemplateFile $templateFile -TemplateParameterObject $templateFileParameters - } catch { - throw $_ } finally { $DebugPreference = $lastDebugPreference }