Skip to content

Sync eng/common directory with azure-sdk-tools for PR 8452 #7687

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
azure-sdk merged 1 commit into from
Jun 17, 2024
Merged

Sync eng/common directory with azure-sdk-tools for PR 8452 #7687

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Pass pipeline vnet to live test arm templates
  • Loading branch information
@benbp @azure-sdk
benbp authored and azure-sdk committed Jun 17, 2024
commit 9e4db01408d4c60b9be4597d8da695711a4bcb54
13 changes: 12 additions & 1 deletion eng/common/TestResources/New-TestResources.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down Expand Up @@ -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)
Expand Down