Skip to content

Commit

Permalink
Fix image tag for multiimage deployments (#22224)
Browse files Browse the repository at this point in the history
Co-authored-by: Liudmila Molkova <limolkova@microsoft.com>
  • Loading branch information
azure-sdk and lmolkova authored Jan 9, 2024
1 parent 0fbeb23 commit 58413e0
Showing 1 changed file with 4 additions and 4 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -257,7 +257,7 @@ function DeployStressPackage(
if ($pkg.Dockerfile -or $pkg.DockerBuildDir) {
throw "The chart.yaml docker config is deprecated, please use the scenarios matrix instead."
}


foreach ($dockerBuildConfig in $dockerBuildConfigs) {
$dockerFilePath = $dockerBuildConfig.dockerFilePath
Expand Down Expand Up @@ -285,7 +285,7 @@ function DeployStressPackage(
$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 <shell, e.g. 'bash' 'pwsh' 'sh'>" -ForegroundColor DarkBlue
Expand All @@ -302,7 +302,7 @@ function DeployStressPackage(
}
}
$generatedHelmValues.scenarios = @( foreach ($scenario in $generatedHelmValues.scenarios) {
$dockerPath = if ("image" -notin $scenario) {
$dockerPath = if ("image" -notin $scenario.keys) {
$dockerFilePath
} else {
Join-Path $pkg.Directory $scenario.image
Expand Down Expand Up @@ -476,7 +476,7 @@ function generateRetryTestsHelmValues ($pkg, $releaseName, $generatedHelmValues)
$failedJobsScenario += $job.split("-$($pkg.ReleaseName)")[0]
}
}

$releaseName = "$($pkg.ReleaseName)-$revision-retry"

$retryTestsHelmVal = @{"scenarios"=@()}
Expand Down

0 comments on commit 58413e0

Please sign in to comment.