Skip to content

[HTTP/SSL] Revert docker-compose command changes from PR #125995 #126399

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
ManickaP merged 4 commits into from
Apr 2, 2026
+14 −12
Merged

[HTTP/SSL] Revert docker-compose command changes from PR #125995 #126399

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
3f3edaa
Revert docker-compose command changes from PR #125995
ManickaP Mar 30, 2026
3a9e32a
Fix pattern in path based trigger
ManickaP Apr 1, 2026
ee7d3f8
Fix branch in PR trigger
ManickaP Apr 1, 2026
c6372c2
Win with dash, Lin without
ManickaP Apr 1, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 5 additions & 4 deletions eng/pipelines/libraries/stress/http.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,8 @@ trigger: none
pr:
branches:
include:
- "*"
- main
- release/*.0
paths:
include:
- src/libraries/System.Net.Http/tests/StressTests/HttpStress/**
Expand Down Expand Up @@ -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'))

Expand All @@ -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'))

Expand All @@ -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'))

Expand Down
5 changes: 3 additions & 2 deletions eng/pipelines/libraries/stress/ssl.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,8 @@ trigger: none
pr:
branches:
include:
- "*"
- main
- release/*.0
paths:
include:
- src/libraries/System.Net.Security/tests/StressTests/SslStress/**
Expand Down Expand Up @@ -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
Expand Down
12 changes: 6 additions & 6 deletions src/libraries/Common/tests/System/Net/StressTests/run-docker-compose.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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(
Expand Down Expand Up @@ -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"
Expand All @@ -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 {
Expand All @@ -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
}
Loading