diff --git a/eng/pipelines/libraries/stress/http.yml b/eng/pipelines/libraries/stress/http.yml index 3a1f38c543898e..ead429394df38a 100644 --- a/eng/pipelines/libraries/stress/http.yml +++ b/eng/pipelines/libraries/stress/http.yml @@ -3,7 +3,8 @@ trigger: none pr: branches: include: - - "*" + - main + - release/*.0 paths: include: - src/libraries/System.Net.Http/tests/StressTests/HttpStress/** @@ -143,7 +144,7 @@ extends: $env:STRESS_CLIENT_ARGS = "$env:HTTPSTRESS_CLIENT_ARGS -http 3.0" $env:STRESS_SERVER_ARGS = "$env:HTTPSTRESS_SERVER_ARGS -http 3.0" New-Item -Force $env:DUMPS_SHARE -ItemType Directory - docker compose up --abort-on-container-exit --no-color + docker-compose up --abort-on-container-exit --no-color displayName: Run HttpStress - HTTP 3.0 condition: and(eq(variables['buildRuntime.succeeded'], 'true'), eq(variables['buildStress.succeeded'], 'true')) @@ -152,7 +153,7 @@ extends: $env:STRESS_CLIENT_ARGS = "$env:HTTPSTRESS_CLIENT_ARGS -http 2.0" $env:STRESS_SERVER_ARGS = "$env:HTTPSTRESS_SERVER_ARGS -http 2.0" New-Item -Force $env:DUMPS_SHARE -ItemType Directory - docker compose up --abort-on-container-exit --no-color + docker-compose up --abort-on-container-exit --no-color displayName: Run HttpStress - HTTP 2.0 condition: and(eq(variables['buildRuntime.succeeded'], 'true'), eq(variables['buildStress.succeeded'], 'true')) @@ -161,7 +162,7 @@ extends: $env:STRESS_CLIENT_ARGS = "$env:HTTPSTRESS_CLIENT_ARGS -http 1.1" $env:STRESS_SERVER_ARGS = "$env:HTTPSTRESS_SERVER_ARGS -http 1.1" New-Item -Force $env:DUMPS_SHARE -ItemType Directory - docker compose up --abort-on-container-exit --no-color + docker-compose up --abort-on-container-exit --no-color displayName: Run HttpStress - HTTP 1.1 condition: and(eq(variables['buildRuntime.succeeded'], 'true'), eq(variables['buildStress.succeeded'], 'true')) diff --git a/eng/pipelines/libraries/stress/ssl.yml b/eng/pipelines/libraries/stress/ssl.yml index 7cd8490b47ffd5..52e1d07748b27e 100644 --- a/eng/pipelines/libraries/stress/ssl.yml +++ b/eng/pipelines/libraries/stress/ssl.yml @@ -3,7 +3,8 @@ trigger: none pr: branches: include: - - "*" + - main + - release/*.0 paths: include: - src/libraries/System.Net.Security/tests/StressTests/SslStress/** @@ -101,7 +102,7 @@ extends: $env:STRESS_CLIENT_ARGS = $env:SSLSTRESS_CLIENT_ARGS $env:STRESS_SERVER_ARGS = $env:SSLSTRESS_SERVER_ARGS New-Item -Force $env:DUMPS_SHARE -ItemType Directory - docker compose up --abort-on-container-exit --no-color + docker-compose up --abort-on-container-exit --no-color displayName: Run SslStress - publish: $(Build.ArtifactStagingDirectory)/dumps diff --git a/src/libraries/Common/tests/System/Net/StressTests/run-docker-compose.ps1 b/src/libraries/Common/tests/System/Net/StressTests/run-docker-compose.ps1 index 0897e62ad36ede..aa98ee92c4ee90 100644 --- a/src/libraries/Common/tests/System/Net/StressTests/run-docker-compose.ps1 +++ b/src/libraries/Common/tests/System/Net/StressTests/run-docker-compose.ps1 @@ -1,5 +1,5 @@ #!/usr/bin/env pwsh -# Runs the stress test using docker compose +# Runs the stress test using docker-compose [CmdletBinding(PositionalBinding = $false)] Param( @@ -50,7 +50,7 @@ if ($useWindowsContainers) { } if (!$noBuild) { - # Dockerize the stress app using docker compose + # Dockerize the stress app using docker-compose $BuildArgs = @( "--build-arg", "VERSION=$Version", "--build-arg", "CONFIGURATION=$configuration" @@ -61,10 +61,10 @@ if (!$noBuild) { $originalErrorPreference = $ErrorActionPreference $ErrorActionPreference = 'Continue' try { - write-output "docker compose --file $COMPOSE_FILE build $buildArgs" - docker compose --file $COMPOSE_FILE build @buildArgs 2>&1 + write-output "docker-compose --file $COMPOSE_FILE build $buildArgs" + docker-compose --file $COMPOSE_FILE build @buildArgs 2>&1 if ($LASTEXITCODE -ne 0) { - throw "docker compose exited with error code $LASTEXITCODE" + throw "docker-compose exited with error code $LASTEXITCODE" } } finally { @@ -86,5 +86,5 @@ if (!$buildOnly) { $env:STRESS_CLIENT_ARGS = $clientStressArgs $env:STRESS_SERVER_ARGS = $serverStressArgs - docker compose --file "$COMPOSE_FILE" up --abort-on-container-exit + docker-compose --file "$COMPOSE_FILE" up --abort-on-container-exit }