From 038e50b4576a8b3d117118126f75abec32082790 Mon Sep 17 00:00:00 2001 From: Ben Broderick Phillips Date: Wed, 1 Feb 2023 17:44:20 -0500 Subject: [PATCH] Enable nodepool update via bicep and update node SKUs --- .../scripts/stress-testing/deploy-stress-tests.ps1 | 4 ---- .../stress-testing/stress-test-deployment-lib.ps1 | 13 ++++++++----- 2 files changed, 8 insertions(+), 9 deletions(-) diff --git a/eng/common/scripts/stress-testing/deploy-stress-tests.ps1 b/eng/common/scripts/stress-testing/deploy-stress-tests.ps1 index 4181e933e2..bbf1d1d425 100644 --- a/eng/common/scripts/stress-testing/deploy-stress-tests.ps1 +++ b/eng/common/scripts/stress-testing/deploy-stress-tests.ps1 @@ -10,11 +10,7 @@ param( [switch]$PushImages, [string]$ClusterGroup, [string]$DeployId, - - [Parameter(ParameterSetName = 'DoLogin', Mandatory = $true)] [switch]$Login, - - [Parameter(ParameterSetName = 'DoLogin')] [string]$Subscription, # Default to true in Azure Pipelines environments diff --git a/eng/common/scripts/stress-testing/stress-test-deployment-lib.ps1 b/eng/common/scripts/stress-testing/stress-test-deployment-lib.ps1 index 77df823053..bafbf77a94 100644 --- a/eng/common/scripts/stress-testing/stress-test-deployment-lib.ps1 +++ b/eng/common/scripts/stress-testing/stress-test-deployment-lib.ps1 @@ -117,12 +117,11 @@ function DeployStressTests( } $clusterGroup = 'rg-stress-cluster-prod' $subscription = 'Azure SDK Test Resources' + } elseif (!$clusterGroup -or !$subscription) { + throw "clusterGroup and subscription parameters must be specified when deploying to an environment that is not pg or prod." } if ($login) { - if (!$clusterGroup -or !$subscription) { - throw "clusterGroup and subscription parameters must be specified when logging into an environment that is not pg or prod." - } Login -subscription $subscription -clusterGroup $clusterGroup -pushImages:$pushImages } @@ -160,7 +159,9 @@ function DeployStressTests( -environment $environment ` -repositoryBase $repository ` -pushImages:$pushImages ` - -login:$login + -login:$login ` + -clusterGroup $clusterGroup ` + -subscription $subscription } if ($FailedCommands.Count -lt $pkgs.Count) { @@ -185,7 +186,9 @@ function DeployStressPackage( [string]$environment, [string]$repositoryBase, [switch]$pushImages, - [switch]$login + [switch]$login, + [string]$clusterGroup, + [string]$subscription ) { $registry = RunOrExitOnFailure az acr list -g $clusterGroup --subscription $subscription -o json $registryName = ($registry | ConvertFrom-Json).name