33    displayName : ' Get variables if EventHub' 
44    condition : eq(variables['SDK'], 'EventHub') 
55    inputs :
6-       azureSubscription : azure-sdk-tests 
6+       azureSubscription : azure-sdk-tests-public  
77      ScriptType : InlineScript 
88      azurePowerShellVersion : LatestVersion 
99      pwsh : true 
2020    displayName : ' Get variables if ServiceBus' 
2121    condition : eq(variables['SDK'], 'ServiceBus') 
2222    inputs :
23-       azureSubscription : azure-sdk-tests 
23+       azureSubscription : azure-sdk-tests-public  
2424      ScriptType : InlineScript 
2525      azurePowerShellVersion : LatestVersion 
2626      pwsh : true 
@@ -41,16 +41,29 @@ steps:
4141task : AzurePowerShell@5 
4242    inputs :
4343      workingDirectory : azure-sdk-for-python 
44-       azureSubscription : azure-sdk-tests 
44+       azureSubscription : azure-sdk-tests-public  
4545      azurePowerShellVersion : LatestVersion 
4646      pwsh : True 
4747      ScriptType : InlineScript 
4848      Inline : | 
4949        eng/common/scripts/Import-AzModules.ps1 
5050
51-         $subscriptionConfiguration = @' 
52-           $(sub-config-azure-cloud-test-resources) 
53-         '@ | ConvertFrom-Json -AsHashtable; 
51+         $subscriptionConfiguration = @{} 
52+ 
53+         $context = Get-AzContext 
54+         $subscriptionConfiguration["Environment"] = $context.Environment.Name 
55+         $subscriptionConfiguration["SubscriptionId"] = $context.Subscription.Id 
56+         $subscriptionConfiguration["TenantId"] = $context.Subscription.TenantId 
57+         $subscriptionConfiguration["TestApplicationId"] = $context.Account.Id 
58+         $subscriptionConfiguration["ProvisionerApplicationId"] = $context.Account.Id 
59+ 
60+         $principal = Get-AzADServicePrincipal -ApplicationId $context.Account.Id 
61+         $subscriptionConfiguration["TestApplicationOid"] = $principal.Id 
62+         $subscriptionConfiguration["ProvisionerApplicationOid"] = $principal.Id 
63+ 
64+         Write-Host ($subscriptionConfiguration | ConvertTo-Json) 
65+         # Write the new SubscriptionConfiguration to be used by the remove test resources 
66+         Write-Host "##vso[task.setvariable variable=SubscriptionConfiguration;]$($subscriptionConfiguration | ConvertTo-Json -Compress)" 
5467
5568        eng/common/TestResources/New-TestResources.ps1 ` 
5669          -ResourceType test ` 
@@ -88,7 +101,7 @@ steps:
88101      TEST_PYAMQP : ' false' 
89102      PROXY_URL : ' http://localhost:5000' 
90103    inputs :
91-       azureSubscription : azure-sdk-tests 
104+       azureSubscription : azure-sdk-tests-public  
92105      azurePowerShellVersion : LatestVersion 
93106      pwsh : true 
94107      ScriptType : InlineScript 
@@ -116,15 +129,15 @@ steps:
116129task : AzurePowerShell@5 
117130    inputs :
118131      workingDirectory : azure-sdk-for-python 
119-       azureSubscription : azure-sdk-tests 
132+       azureSubscription : azure-sdk-tests-public  
120133      azurePowerShellVersion : LatestVersion 
121134      pwsh : True 
122135      ScriptType : InlineScript 
123136      Inline : | 
124137        eng/common/scripts/Import-AzModules.ps1 
125138
126139        $subscriptionConfiguration = @' 
127-           $(sub-config-azure-cloud-test-resources ) 
140+           $(SubscriptionConfiguration ) 
128141        '@ | ConvertFrom-Json -AsHashtable; 
129142
130143        eng/common/TestResources/Remove-TestResources.ps1 ` 
0 commit comments