@@ -43,12 +43,12 @@ function RunOrExitOnFailure()
43
43
}
44
44
}
45
45
46
- function Login ([string ]$subscription , [string ]$clusterGroup , [switch ]$skipPushImages )
46
+ function Login ([string ]$subscription , [string ]$tenant , [ string ] $ clusterGroup, [switch ]$skipPushImages )
47
47
{
48
48
Write-Host " Logging in to subscription, cluster and container registry"
49
49
az account show - s " $subscription " * > $null
50
50
if ($LASTEXITCODE ) {
51
- RunOrExitOnFailure az login -- allow- no- subscriptions
51
+ RunOrExitOnFailure az login -- allow- no- subscriptions -- tenant $tenant
52
52
}
53
53
54
54
# Discover cluster name, only one cluster per group is expected
@@ -116,24 +116,27 @@ function DeployStressTests(
116
116
}
117
117
$clusterGroup = ' rg-stress-cluster-pg'
118
118
$subscription = ' Azure SDK Developer Playground'
119
+ $tenant = ' 72f988bf-86f1-41af-91ab-2d7cd011db47'
119
120
} elseif ($environment -eq ' prod' ) {
120
121
if ($clusterGroup -or $subscription ) {
121
122
Write-Warning " Overriding cluster group and subscription with defaults for 'prod' environment."
122
123
}
123
124
$clusterGroup = ' rg-stress-cluster-prod'
124
125
$subscription = ' Azure SDK Test Resources - TME'
126
+ $tenant = ' 70a036f6-8e4d-4615-bad6-149c02e7720d'
125
127
} elseif ($environment -eq ' storage' ) {
126
128
if ($clusterGroup -or $subscription ) {
127
129
Write-Warning " Overriding cluster group and subscription with defaults for 'storage' environment."
128
130
}
129
131
$clusterGroup = ' rg-stress-cluster-storage'
130
- $subscription = ' XClient'
131
- } elseif (! $clusterGroup -or ! $subscription ) {
132
- throw " clusterGroup and subscription parameters must be specified when deploying to an environment that is not pg or prod."
132
+ $subscription = ' Azure SDK Test Resources - TME'
133
+ $tenant = ' 72f988bf-86f1-41af-91ab-2d7cd011db47'
134
+ } elseif (! $clusterGroup -or ! $subscription -or $tenant ) {
135
+ throw " -ClusterGroup, -Subscription and -Tenant parameters must be specified when deploying to an environment that is not pg or prod."
133
136
}
134
137
135
138
if (! $skipLogin ) {
136
- Login - subscription $subscription - clusterGroup $clusterGroup - skipPushImages:$skipPushImages
139
+ Login - subscription $subscription - tenant $tenant - clusterGroup $clusterGroup - skipPushImages:$skipPushImages
137
140
}
138
141
139
142
$chartRepoName = ' stress-test-charts'
0 commit comments