From c6334c02ad779f27d81978f168755408b856dfcd Mon Sep 17 00:00:00 2001 From: Azure SDK Bot <53356347+azure-sdk@users.noreply.github.com> Date: Wed, 26 Feb 2025 14:17:02 -0800 Subject: [PATCH] Sync eng/common directory with azure-sdk-tools for PR 9888 (#6434) * Move stress helm charts to azuresdkartifacts. Add publish pipeline * Update stress deploy * Fix tenant reference for pg tme cluster * Update cluster config * Fix powershell module install when whatif is set --------- Co-authored-by: Ben Broderick Phillips --- eng/common/scripts/Helpers/PSModule-Helpers.ps1 | 2 +- eng/common/scripts/stress-testing/deploy-stress-tests.ps1 | 2 ++ .../scripts/stress-testing/stress-test-deployment-lib.ps1 | 6 +++--- 3 files changed, 6 insertions(+), 4 deletions(-) mode change 100644 => 100755 eng/common/scripts/stress-testing/deploy-stress-tests.ps1 diff --git a/eng/common/scripts/Helpers/PSModule-Helpers.ps1 b/eng/common/scripts/Helpers/PSModule-Helpers.ps1 index 934625957..f79ce1a52 100644 --- a/eng/common/scripts/Helpers/PSModule-Helpers.ps1 +++ b/eng/common/scripts/Helpers/PSModule-Helpers.ps1 @@ -102,7 +102,7 @@ function installModule([string]$moduleName, [string]$version, $repoUrl) { Write-Verbose "Installing module $moduleName with min version $version from $repoUrl" # Install under CurrentUser scope so that the end up under $CurrentUserModulePath for caching - Install-Module $moduleName -MinimumVersion $version -Repository $repo.Name -Scope CurrentUser -Force + Install-Module $moduleName -MinimumVersion $version -Repository $repo.Name -Scope CurrentUser -Force -WhatIf:$false # Ensure module installed $modules = (Get-Module -ListAvailable $moduleName) if ($version -as [Version]) { diff --git a/eng/common/scripts/stress-testing/deploy-stress-tests.ps1 b/eng/common/scripts/stress-testing/deploy-stress-tests.ps1 old mode 100644 new mode 100755 index 76e0de20b..cf763b5bb --- a/eng/common/scripts/stress-testing/deploy-stress-tests.ps1 +++ b/eng/common/scripts/stress-testing/deploy-stress-tests.ps1 @@ -1,3 +1,5 @@ +#! /bin/env pwsh + # Not defining a default parameter set makes SkipLogin/Subscription required all the time. [CmdletBinding(DefaultParameterSetName = 'Default')] param( 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 498d4418f..3de02c1d7 100644 --- a/eng/common/scripts/stress-testing/stress-test-deployment-lib.ps1 +++ b/eng/common/scripts/stress-testing/stress-test-deployment-lib.ps1 @@ -115,8 +115,8 @@ function DeployStressTests( Write-Warning "Overriding cluster group and subscription with defaults for 'pg' environment." } $clusterGroup = 'rg-stress-cluster-pg' - $subscription = 'Azure SDK Developer Playground' - $tenant = '72f988bf-86f1-41af-91ab-2d7cd011db47' + $subscription = 'Azure SDK Test Resources - TME' + $tenant = '70a036f6-8e4d-4615-bad6-149c02e7720d' } elseif ($environment -eq 'prod') { if ($clusterGroup -or $subscription) { Write-Warning "Overriding cluster group and subscription with defaults for 'prod' environment." @@ -147,7 +147,7 @@ function DeployStressTests( } RunOrExitOnFailure helm repo add --force-update $chartRepoName file://$absAddonsPath } else { - RunOrExitOnFailure helm repo add --force-update $chartRepoName https://stresstestcharts.blob.core.windows.net/helm/ + RunOrExitOnFailure helm repo add --force-update $chartRepoName https://azuresdkartifacts.z5.web.core.windows.net/stress/ } Run helm repo update