From 4d4dfc8c514355d33e6db1934b670370513fff9c Mon Sep 17 00:00:00 2001 From: Azure SDK Bot <53356347+azure-sdk@users.noreply.github.com> Date: Tue, 29 Nov 2022 02:06:51 -0500 Subject: [PATCH] Sync eng/common directory with azure-sdk-tools for PR 4713 (#4135) * stress matrix docker args * github pr update Co-authored-by: Albert Cheng --- .../stress-testing/stress-test-deployment-lib.ps1 | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) 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 d99dd763f..80c12a8bc 100644 --- a/eng/common/scripts/stress-testing/stress-test-deployment-lib.ps1 +++ b/eng/common/scripts/stress-testing/stress-test-deployment-lib.ps1 @@ -233,7 +233,9 @@ function DeployStressPackage( $dockerBuildDir = Split-Path $dockerFilePath } $dockerBuildDir = [System.IO.Path]::GetFullPath($dockerBuildDir).Trim() - $dockerBuildConfigs += @{"dockerFilePath"=$dockerFilePath; "dockerBuildDir"=$dockerBuildDir} + $dockerBuildConfigs += @{"dockerFilePath"=$dockerFilePath; + "dockerBuildDir"=$dockerBuildDir; + "scenario"=$scenario} } } if ($pkg.Dockerfile -or $pkg.DockerBuildDir) { @@ -256,8 +258,15 @@ function DeployStressPackage( Write-Host "Building and pushing stress test docker image '$imageTag'" $dockerFile = Get-ChildItem $dockerFilePath - Run docker build -t $imageTag -f $dockerFile $dockerBuildFolder + $dockerBuildCmd = "docker", "build", "-t", $imageTag, "-f", $dockerFile + foreach ($buildArg in $dockerBuildConfig.scenario.GetEnumerator()) { + $dockerBuildCmd += "--build-arg" + $dockerBuildCmd += "'$($buildArg.Key)'='$($buildArg.Value)'" + } + $dockerBuildCmd += $dockerBuildFolder + Run @dockerBuildCmd + Write-Host "`nContainer image '$imageTag' successfully built. To run commands on the container locally:" -ForegroundColor Blue Write-Host " docker run -it $imageTag" -ForegroundColor DarkBlue Write-Host " docker run -it $imageTag " -ForegroundColor DarkBlue