Skip to content

Commit 530ddf1

Browse files
azure-sdkbenbp
andauthored
Sync eng/common directory with azure-sdk-tools for PR 1188 (Azure#17488)
* Add debug flag to arm deployment command * Only set debug preference when $CI is true Co-authored-by: Ben Broderick Phillips <bebroder@microsoft.com>
1 parent 2a4eefe commit 530ddf1

File tree

1 file changed

+10
-2
lines changed

1 file changed

+10
-2
lines changed

eng/common/TestResources/New-TestResources.ps1

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -308,7 +308,7 @@ if ($CI) {
308308
if ($EnvironmentVariables.ContainsKey('AZURE_RESOURCEGROUP_NAME') -and `
309309
$EnvironmentVariables['AZURE_RESOURCEGROUP_NAME'] -ne $ResourceGroupName)
310310
{
311-
Write-Warning ("Overwriting 'EnvironmentVariables.AZURE_RESOURCEGROUP_NAME' with value " +
311+
Write-Warning ("Overwriting 'EnvironmentVariables.AZURE_RESOURCEGROUP_NAME' with value " +
312312
"'$($EnvironmentVariables['AZURE_RESOURCEGROUP_NAME'])' " + "to new value '$($ResourceGroupName)'")
313313
}
314314
$EnvironmentVariables['AZURE_RESOURCEGROUP_NAME'] = $ResourceGroupName
@@ -385,7 +385,15 @@ foreach ($templateFile in $templateFiles) {
385385

386386
Log "Deploying template '$templateFile' to resource group '$($resourceGroup.ResourceGroupName)'"
387387
$deployment = Retry {
388-
New-AzResourceGroupDeployment -Name $BaseName -ResourceGroupName $resourceGroup.ResourceGroupName -TemplateFile $templateFile -TemplateParameterObject $templateFileParameters
388+
$lastDebugPreference = $DebugPreference
389+
try {
390+
if ($CI) {
391+
$DebugPreference = "Continue"
392+
}
393+
New-AzResourceGroupDeployment -Name $BaseName -ResourceGroupName $resourceGroup.ResourceGroupName -TemplateFile $templateFile -TemplateParameterObject $templateFileParameters
394+
} finally {
395+
$DebugPreference = $lastDebugPreference
396+
}
389397
}
390398

391399
if ($deployment.ProvisioningState -eq 'Succeeded') {

0 commit comments

Comments
 (0)