Pass pipeline vnet to live test arm templates (#5724)
Co-authored-by: Ben Broderick Phillips <bebroder@microsoft.com>
This commit is contained in:
parent
b7b9ab04af
commit
c4a395e0b9
@ -106,6 +106,15 @@ param (
|
||||
|
||||
. $PSScriptRoot/SubConfig-Helpers.ps1
|
||||
|
||||
$azsdkPipelineVnet = "/subscriptions/a18897a6-7e44-457d-9260-f2854c0aca42/resourceGroups/azsdk-pools/providers/Microsoft.Network/virtualNetworks/azsdk-pipeline-vnet-wus"
|
||||
$azsdkPipelineSubnets = @(
|
||||
($azsdkPipelineVnet + "/subnets/pipeline-subnet-ubuntu-1804-general"),
|
||||
($azsdkPipelineVnet + "/subnets/pipeline-subnet-ubuntu-2004-general"),
|
||||
($azsdkPipelineVnet + "/subnets/pipeline-subnet-ubuntu-2204-general"),
|
||||
($azsdkPipelineVnet + "/subnets/pipeline-subnet-win-2019-general"),
|
||||
($azsdkPipelineVnet + "/subnets/pipeline-subnet-win-2022-general")
|
||||
)
|
||||
|
||||
if (!$ServicePrincipalAuth) {
|
||||
# Clear secrets if not using Service Principal auth. This prevents secrets
|
||||
# from being passed to pre- and post-scripts.
|
||||
@ -743,13 +752,15 @@ try {
|
||||
if ($ProvisionerApplicationOid) {
|
||||
$templateParameters["provisionerApplicationOid"] = "$ProvisionerApplicationOid"
|
||||
}
|
||||
|
||||
if ($TenantId) {
|
||||
$templateParameters.Add('tenantId', $TenantId)
|
||||
}
|
||||
if ($TestApplicationSecret -and $ServicePrincipalAuth) {
|
||||
$templateParameters.Add('testApplicationSecret', $TestApplicationSecret)
|
||||
}
|
||||
if ($CI -and $Environment -eq 'AzureCloud') {
|
||||
$templateParameters.Add('azsdkPipelineSubnetList', $azsdkPipelineSubnets)
|
||||
}
|
||||
|
||||
$defaultCloudParameters = LoadCloudConfig $Environment
|
||||
MergeHashes $defaultCloudParameters $(Get-Variable templateParameters)
|
||||
|
||||
Loading…
Reference in New Issue
Block a user