Delete azure deployment during pipeline cleanup (#3513)

Author: timtay-microsoft

e2e/test/prerequisites/E2ETestsSetup/e2eTestsSetup.ps1

@@ -14,7 +14,10 @@ param(
     [string] $GroupCertificatePassword,
 
     [Parameter(Mandatory)]
-    [string] $TestCertificateOutputLocation
+    [string] $TestCertificateOutputLocation,
+
+    [Parameter(Mandatory)]
+    [string] $DeploymentName
 )
 
 $startTime = (Get-Date)
@@ -239,15 +242,11 @@ $resourceGroupId = az group show -n $ResourceGroup --query id --out tsv
 # Invoke-Deployment - Uses the .\.json template to create the necessary resources to run E2E tests.
 #######################################################################################################
 
-# Create a unique deployment name
-$randomSuffix = -join ((65..90) + (97..122) | Get-Random -Count 5 | ForEach-Object { [char]$_ })
-$deploymentName = "IotE2eInfra-$randomSuffix"
-
 # Deploy
 Write-Host @"
     `nStarting deployment which may take a while.
     1. Progress can be monitored from the Azure Portal (http://portal.azure.com); go to resource group | deployments | deployment name.
-    2. Info to track: subscription ($SubscriptionId), resource group ($ResourceGroup), deployment name ($deploymentName).
+    2. Info to track: subscription ($SubscriptionId), resource group ($ResourceGroup), deployment name ($DeploymentName).
 "@
 
 az deployment group create `
@@ -272,12 +271,12 @@ Write-Host "`nYour infrastructure is ready in subscription ($SubscriptionId), re
 #########################################################################################################
 
 Write-Host "`nGetting generated names and secrets from ARM template output."
-$iotHubConnectionString = az deployment group show -g $ResourceGroup -n $deploymentName --query 'properties.outputs.hubConnectionString.value' --output tsv
-$dpsName = az deployment group show -g $ResourceGroup -n $deploymentName --query 'properties.outputs.dpsName.value' --output tsv
-$dpsConnectionString = az deployment group show -g $ResourceGroup -n $deploymentName  --query 'properties.outputs.dpsConnectionString.value' --output tsv
-$storageAccountConnectionString = az deployment group show -g $ResourceGroup -n $deploymentName  --query 'properties.outputs.storageAccountConnectionString.value' --output tsv
-$workspaceId = az deployment group show -g $ResourceGroup -n $deploymentName --query 'properties.outputs.workspaceId.value' --output tsv
-$iotHubName = az deployment group show -g $ResourceGroup -n $deploymentName --query 'properties.outputs.hubName.value' --output tsv
+$iotHubConnectionString = az deployment group show -g $ResourceGroup -n $DeploymentName --query 'properties.outputs.hubConnectionString.value' --output tsv
+$dpsName = az deployment group show -g $ResourceGroup -n $DeploymentName --query 'properties.outputs.dpsName.value' --output tsv
+$dpsConnectionString = az deployment group show -g $ResourceGroup -n $DeploymentName  --query 'properties.outputs.dpsConnectionString.value' --output tsv
+$storageAccountConnectionString = az deployment group show -g $ResourceGroup -n $DeploymentName  --query 'properties.outputs.storageAccountConnectionString.value' --output tsv
+$workspaceId = az deployment group show -g $ResourceGroup -n $DeploymentName --query 'properties.outputs.workspaceId.value' --output tsv
+$iotHubName = az deployment group show -g $ResourceGroup -n $DeploymentName --query 'properties.outputs.hubName.value' --output tsv
 
 ##################################################################################################################################
 # Uploading root CA certificate to IoT hub and verifying.

vsts/templates/DeleteCloudResources.yaml

@@ -7,4 +7,5 @@ steps:
     inlineScript: |
       Write-Host "Deleting resource group with name "
       Write-Host $(RESOURCE_GROUP_NAME)
+      az deployment group delete --resource-group $(RESOURCE_GROUP_NAME) --name $(DEPLOYMENT_NAME) --output none --only-show-errors
       az group delete --name $(RESOURCE_GROUP_NAME) --y

vsts/templates/DeployCloudResources.yaml

@@ -16,9 +16,14 @@ steps:
 
       $resourceGroupName = 'dotnetsdkgate'+$CloudResourceUniqueSuffix
 
+      # Create a unique deployment name
+      $randomSuffix = -join ((65..90) + (97..122) | Get-Random -Count 5 | ForEach-Object { [char]$_ })
+      $deploymentName = "DotnetSDKE2eInfra-$randomSuffix"
+
       Write-Host "##vso[task.setvariable variable=RESOURCE_GROUP_NAME;isOutput=true]$resourceGroupName"
+      Write-Host "##vso[task.setvariable variable=DEPLOYMENT_NAME;isOutput=true]$deploymentName"
 
-      $(Build.SourcesDirectory)/e2e/test/prerequisites/E2ETestsSetup/e2eTestsSetup.ps1 -SubscriptionId $subscriptionId -Region westcentralus -ResourceGroup $resourceGroupName -GroupCertificatePassword someCertPass -TestCertificateOutputLocation $(Pipeline.Workspace)/test-certificates
+      $(Build.SourcesDirectory)/e2e/test/prerequisites/E2ETestsSetup/e2eTestsSetup.ps1 -SubscriptionId $subscriptionId -Region westcentralus -ResourceGroup $resourceGroupName -GroupCertificatePassword someCertPass -TestCertificateOutputLocation $(Pipeline.Workspace)/test-certificates -DeploymentName $deploymentName
 
 - publish:  $(Pipeline.Workspace)
   displayName: 'save test certificates locally'

vsts/vsts_linux.yaml

@@ -183,6 +183,7 @@ jobs:
       - DeployCloudTestResources
     variables:
       RESOURCE_GROUP_NAME: $[ dependencies.DeployCloudTestResources.outputs['deployCloudTestResources.RESOURCE_GROUP_NAME'] ]
+      DEPLOYMENT_NAME: $[ dependencies.DeployCloudTestResources.outputs['deployCloudTestResources.DEPLOYMENT_NAME'] ]
     pool:
       vmImage: windows-2022
     steps:

vsts/vsts_windows.yaml

@@ -172,6 +172,7 @@ jobs:
       - DeployCloudTestResources
     variables:
       RESOURCE_GROUP_NAME: $[ dependencies.DeployCloudTestResources.outputs['deployCloudTestResources.RESOURCE_GROUP_NAME'] ]
+      DEPLOYMENT_NAME: $[ dependencies.DeployCloudTestResources.outputs['deployCloudTestResources.DEPLOYMENT_NAME'] ]
     pool:
       vmImage: windows-2022
     steps: