From 114ede664cfeff05e05278c2e5013b3212388e9f Mon Sep 17 00:00:00 2001 From: Azure SDK Bot <53356347+azure-sdk@users.noreply.github.com> Date: Fri, 21 Jun 2024 15:18:15 -0400 Subject: [PATCH] Sync eng/common directory with azure-sdk-tools for PR 8484 (#30134) Sync eng/common directory with azure-sdk-tools for PR https://github.com/Azure/azure-sdk-tools/pull/8484 See [eng/common workflow](https://github.com/Azure/azure-sdk-tools/blob/main/eng/common/README.md#workflow) Co-authored-by: Richard Park --- .../scripts/stress-testing/stress-test-deployment-lib.ps1 | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) 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 c3468a111b5d..aa426d7b4687 100644 --- a/eng/common/scripts/stress-testing/stress-test-deployment-lib.ps1 +++ b/eng/common/scripts/stress-testing/stress-test-deployment-lib.ps1 @@ -285,7 +285,10 @@ function DeployStressPackage( Write-Host "Setting DOCKER_BUILDKIT=1" $env:DOCKER_BUILDKIT = 1 - $dockerBuildCmd = "docker", "build", "-t", $imageTag, "-f", $dockerFile + # Force amd64 since that's what our AKS cluster is running. Without this you + # end up inheriting the default for our platform, which is bad when using ARM + # platforms. + $dockerBuildCmd = "docker", "build", "--platform", "linux/amd64", "-t", $imageTag, "-f", $dockerFile foreach ($buildArg in $dockerBuildConfig.scenario.GetEnumerator()) { $dockerBuildCmd += "--build-arg" $dockerBuildCmd += "'$($buildArg.Key)'='$($buildArg.Value)'"