diff --git a/.azuredevops/pipelineTemplates/jobs.validateModuleDeployment.yml b/.azuredevops/pipelineTemplates/jobs.validateModuleDeployment.yml index cb80dd5790..207b45e811 100644 --- a/.azuredevops/pipelineTemplates/jobs.validateModuleDeployment.yml +++ b/.azuredevops/pipelineTemplates/jobs.validateModuleDeployment.yml @@ -359,6 +359,7 @@ jobs: DeploymentName = '$(deploymentName)' TemplateFilePath = $templateFilePath ResourceGroupName = '${{ parameters.resourceGroupName }}' + subscriptionId = '${{ parameters.subscriptionId }}' ManagementGroupId = '${{ parameters.managementGroupId }}' Verbose = $true } diff --git a/utilities/pipelines/resourceRemoval/Initialize-DeploymentRemoval.ps1 b/utilities/pipelines/resourceRemoval/Initialize-DeploymentRemoval.ps1 index e7aad99a7e..4ac7bbd16c 100644 --- a/utilities/pipelines/resourceRemoval/Initialize-DeploymentRemoval.ps1 +++ b/utilities/pipelines/resourceRemoval/Initialize-DeploymentRemoval.ps1 @@ -36,6 +36,9 @@ function Initialize-DeploymentRemoval { [Parameter(Mandatory = $false)] [string] $ResourceGroupName, + [Parameter(Mandatory = $false)] + [string] $subscriptionId, + [Parameter(Mandatory = $false)] [string] $ManagementGroupId ) @@ -47,6 +50,12 @@ function Initialize-DeploymentRemoval { } process { + + if (-not [String]::IsNullOrEmpty($subscriptionId)) { + Write-Verbose ('Setting context to subscription [{0}]' -f $subscriptionId) + $null = Set-AzContext -Subscription $subscriptionId + } + $moduleName = Split-Path (Split-Path $templateFilePath -Parent) -LeafBase # The initial sequence is a general order-recommendation