github/azure-sdk-for-cpp
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Improve scenario matrix edge case handling (#4065)

Browse Source 
Co-authored-by: Ben Broderick Phillips <bebroder@microsoft.com>
This commit is contained in:
Azure SDK Bot 2022-10-26 12:51:22 -07:00 committed by GitHub
parent 673bacba08
commit f174d97e8a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
eng/common/scripts/stress-testing/generate-scenario-matrix.ps1
View File

@ -39,12 +39,16 @@ function GenerateScenarioMatrix(
$scenariosMatrix += $entry
}
$valuesYaml = Get-Content -Raw (Join-Path (Split-Path $matrixFilePath) 'values.yaml')
$values = $valuesYaml | ConvertFrom-Yaml -Ordered
if (!$values) {$values = @{}}
$valuesConfig = Join-Path (Split-Path $matrixFilePath) 'values.yaml'
$values = [ordered]@{}
if (Test-Path $valuesConfig) {
$valuesYaml = Get-Content -Raw $valuesConfig
$values = $valuesYaml | ConvertFrom-Yaml -Ordered
if (!$values) {$values = @{}}
if ($values.ContainsKey('Scenarios')) {
throw "Please use matrix generation for stress test scenarios."
if ($values.ContainsKey('Scenarios')) {
throw "Please use matrix generation for stress test scenarios."
}
}
$values.scenarios = $scenariosMatrix

4
eng/common/scripts/stress-testing/stress-test-deployment-lib.ps1
View File

@ -248,7 +248,7 @@ function DeployStressPackage(
}
}
}
$genVal.scenarios = foreach ($scenario in $genVal.scenarios) {
$genVal.scenarios = @( foreach ($scenario in $genVal.scenarios) {
$dockerPath = Join-Path $pkg.Directory $scenario.image
if ("image" -notin $scenario) {
$dockerPath = $dockerFilePath
@ -257,7 +257,7 @@ function DeployStressPackage(
$scenario.imageTag = $imageTag
}
$scenario
}
} )
$genVal | ConvertTo-Yaml | Out-File -FilePath $genValFile
}