From 3f3edaa45d5a31f3e4c15458072342e7f65a8643 Mon Sep 17 00:00:00 2001 From: ManickaP Date: Mon, 30 Mar 2026 15:11:08 +0200 Subject: [PATCH 1/4] Revert docker-compose command changes from PR #125995 Reverts the docker-compose -> docker compose command changes introduced in #125995, while keeping the Azure Linux 3 image pool swap. Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com> --- eng/pipelines/libraries/enterprise/linux.yml | 6 +++--- eng/pipelines/libraries/stress/http.yml | 16 ++++++++-------- eng/pipelines/libraries/stress/ssl.yml | 4 ++-- .../Net/StressTests/run-docker-compose.ps1 | 12 ++++++------ .../System/Net/StressTests/run-docker-compose.sh | 6 +++--- 5 files changed, 22 insertions(+), 22 deletions(-) diff --git a/eng/pipelines/libraries/enterprise/linux.yml b/eng/pipelines/libraries/enterprise/linux.yml index beaa3ac99b3776..50f6c04b6b501d 100644 --- a/eng/pipelines/libraries/enterprise/linux.yml +++ b/eng/pipelines/libraries/enterprise/linux.yml @@ -43,14 +43,14 @@ extends: steps: - bash: | cd $(enterpriseTestsSetup) - docker compose build + docker-compose build displayName: Build test machine images env: DOTNET_RUNTIME_REPO_ROOT: $(Build.SourcesDirectory) - bash: | cd $(enterpriseTestsSetup) - docker compose up -d + docker-compose up -d displayName: Start test network and machines env: DOTNET_RUNTIME_REPO_ROOT: $(Build.SourcesDirectory) @@ -73,7 +73,7 @@ extends: - bash: | cd $(enterpriseTestsSetup) - docker compose down + docker-compose down displayName: Stop test network and machines env: DOTNET_RUNTIME_REPO_ROOT: $(Build.SourcesDirectory) diff --git a/eng/pipelines/libraries/stress/http.yml b/eng/pipelines/libraries/stress/http.yml index 3a1f38c543898e..0b094d9214145d 100644 --- a/eng/pipelines/libraries/stress/http.yml +++ b/eng/pipelines/libraries/stress/http.yml @@ -68,7 +68,7 @@ extends: export STRESS_CLIENT_ARGS="$HTTPSTRESS_CLIENT_ARGS -http 3.0" export STRESS_SERVER_ARGS="$HTTPSTRESS_SERVER_ARGS -http 3.0" mkdir -p $DUMPS_SHARE - docker compose up --abort-on-container-exit --no-color + docker-compose up --abort-on-container-exit --no-color timeoutInMinutes: 35 # In case the HTTP/3.0 run hangs, we timeout shortly after the expected 30 minute run displayName: Run HttpStress - HTTP 3.0 condition: and(eq(variables['buildRuntime.succeeded'], 'true'), eq(variables['buildStress.succeeded'], 'true')) @@ -78,8 +78,8 @@ extends: export STRESS_CLIENT_ARGS="$HTTPSTRESS_CLIENT_ARGS -http 2.0" export STRESS_SERVER_ARGS="$HTTPSTRESS_SERVER_ARGS -http 2.0" mkdir -p $DUMPS_SHARE - docker compose down - docker compose up --abort-on-container-exit --no-color + docker-compose down + 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')) @@ -88,8 +88,8 @@ extends: export STRESS_CLIENT_ARGS="$HTTPSTRESS_CLIENT_ARGS -http 1.1" export STRESS_SERVER_ARGS="$HTTPSTRESS_SERVER_ARGS -http 1.1" mkdir -p $DUMPS_SHARE - docker compose down - docker compose up --abort-on-container-exit --no-color + docker-compose down + 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')) @@ -143,7 +143,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 +152,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 +161,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..64e628b5f98f0c 100644 --- a/eng/pipelines/libraries/stress/ssl.yml +++ b/eng/pipelines/libraries/stress/ssl.yml @@ -65,7 +65,7 @@ extends: export STRESS_CLIENT_ARGS=$SSLSTRESS_CLIENT_ARGS export STRESS_SERVER_ARGS=$SSLSTRESS_SERVER_ARGS mkdir -p $DUMPS_SHARE - 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 @@ -101,7 +101,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 } diff --git a/src/libraries/Common/tests/System/Net/StressTests/run-docker-compose.sh b/src/libraries/Common/tests/System/Net/StressTests/run-docker-compose.sh index 9db8f7f5b59d7a..6b50a01f5d2ffa 100755 --- a/src/libraries/Common/tests/System/Net/StressTests/run-docker-compose.sh +++ b/src/libraries/Common/tests/System/Net/StressTests/run-docker-compose.sh @@ -1,5 +1,5 @@ #!/usr/bin/env bash -# Runs the stress test using docker compose +# Runs the stress test using docker-compose # Stop script if unbound variable found (use ${var:-} if intentional) set -u @@ -100,7 +100,7 @@ if [[ "$nobuild" -eq 0 ]]; then build_args="$build_args --build-arg SDK_BASE_IMAGE=$imagename" fi - if ! docker compose --file "$compose_file" build $build_args; then + if ! docker-compose --file "$compose_file" build $build_args; then exit $? fi fi @@ -113,6 +113,6 @@ if [[ "$buildonly" -eq 0 ]]; then export STRESS_CLIENT_ARGS=$clientstressargs export STRESS_SERVER_ARGS=$serverstressargs - docker compose --file "$compose_file" up --abort-on-container-exit + docker-compose --file "$compose_file" up --abort-on-container-exit exit $? fi From 3a9e32a3ad918a8ef89ebd7bbae08ca67529cb9a Mon Sep 17 00:00:00 2001 From: ManickaP Date: Wed, 1 Apr 2026 11:36:41 +0200 Subject: [PATCH 2/4] Fix pattern in path based trigger --- eng/pipelines/libraries/stress/http.yml | 6 +++--- eng/pipelines/libraries/stress/ssl.yml | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/eng/pipelines/libraries/stress/http.yml b/eng/pipelines/libraries/stress/http.yml index 0b094d9214145d..d66196f07be991 100644 --- a/eng/pipelines/libraries/stress/http.yml +++ b/eng/pipelines/libraries/stress/http.yml @@ -6,9 +6,9 @@ pr: - "*" paths: include: - - src/libraries/System.Net.Http/tests/StressTests/HttpStress/** - - src/libraries/Common/tests/System/Net/StressTests/** - - eng/pipelines/libraries/stress/** + - src/libraries/System.Net.Http/tests/StressTests/HttpStress/* + - src/libraries/Common/tests/System/Net/StressTests/* + - eng/pipelines/libraries/stress/* schedules: - cron: "0 13 * * *" # 1PM UTC => 5 AM PST diff --git a/eng/pipelines/libraries/stress/ssl.yml b/eng/pipelines/libraries/stress/ssl.yml index 64e628b5f98f0c..3c656c8ca6f757 100644 --- a/eng/pipelines/libraries/stress/ssl.yml +++ b/eng/pipelines/libraries/stress/ssl.yml @@ -6,9 +6,9 @@ pr: - "*" paths: include: - - src/libraries/System.Net.Security/tests/StressTests/SslStress/** - - src/libraries/Common/tests/System/Net/StressTests/** - - eng/pipelines/libraries/stress/** + - src/libraries/System.Net.Security/tests/StressTests/SslStress/* + - src/libraries/Common/tests/System/Net/StressTests/* + - eng/pipelines/libraries/stress/* schedules: - cron: "0 13 * * *" # 1PM UTC => 5 AM PST From ee7d3f88b9886e4ba278256f833ba38500be3400 Mon Sep 17 00:00:00 2001 From: ManickaP Date: Wed, 1 Apr 2026 11:48:18 +0200 Subject: [PATCH 3/4] Fix branch in PR trigger --- eng/pipelines/libraries/stress/http.yml | 9 +++++---- eng/pipelines/libraries/stress/ssl.yml | 9 +++++---- 2 files changed, 10 insertions(+), 8 deletions(-) diff --git a/eng/pipelines/libraries/stress/http.yml b/eng/pipelines/libraries/stress/http.yml index d66196f07be991..adb5667a7bf743 100644 --- a/eng/pipelines/libraries/stress/http.yml +++ b/eng/pipelines/libraries/stress/http.yml @@ -3,12 +3,13 @@ trigger: none pr: branches: include: - - "*" + - main + - release/*.0 paths: include: - - src/libraries/System.Net.Http/tests/StressTests/HttpStress/* - - src/libraries/Common/tests/System/Net/StressTests/* - - eng/pipelines/libraries/stress/* + - src/libraries/System.Net.Http/tests/StressTests/HttpStress/** + - src/libraries/Common/tests/System/Net/StressTests/** + - eng/pipelines/libraries/stress/** schedules: - cron: "0 13 * * *" # 1PM UTC => 5 AM PST diff --git a/eng/pipelines/libraries/stress/ssl.yml b/eng/pipelines/libraries/stress/ssl.yml index 3c656c8ca6f757..089a10adae12cf 100644 --- a/eng/pipelines/libraries/stress/ssl.yml +++ b/eng/pipelines/libraries/stress/ssl.yml @@ -3,12 +3,13 @@ trigger: none pr: branches: include: - - "*" + - main + - release/*.0 paths: include: - - src/libraries/System.Net.Security/tests/StressTests/SslStress/* - - src/libraries/Common/tests/System/Net/StressTests/* - - eng/pipelines/libraries/stress/* + - src/libraries/System.Net.Security/tests/StressTests/SslStress/** + - src/libraries/Common/tests/System/Net/StressTests/** + - eng/pipelines/libraries/stress/** schedules: - cron: "0 13 * * *" # 1PM UTC => 5 AM PST From c6372c2135b37f76aebd9e27b3d1e6906a517900 Mon Sep 17 00:00:00 2001 From: ManickaP Date: Wed, 1 Apr 2026 14:12:07 +0200 Subject: [PATCH 4/4] Win with dash, Lin without --- eng/pipelines/libraries/enterprise/linux.yml | 6 +++--- eng/pipelines/libraries/stress/http.yml | 10 +++++----- eng/pipelines/libraries/stress/ssl.yml | 2 +- .../tests/System/Net/StressTests/run-docker-compose.sh | 6 +++--- 4 files changed, 12 insertions(+), 12 deletions(-) diff --git a/eng/pipelines/libraries/enterprise/linux.yml b/eng/pipelines/libraries/enterprise/linux.yml index 50f6c04b6b501d..beaa3ac99b3776 100644 --- a/eng/pipelines/libraries/enterprise/linux.yml +++ b/eng/pipelines/libraries/enterprise/linux.yml @@ -43,14 +43,14 @@ extends: steps: - bash: | cd $(enterpriseTestsSetup) - docker-compose build + docker compose build displayName: Build test machine images env: DOTNET_RUNTIME_REPO_ROOT: $(Build.SourcesDirectory) - bash: | cd $(enterpriseTestsSetup) - docker-compose up -d + docker compose up -d displayName: Start test network and machines env: DOTNET_RUNTIME_REPO_ROOT: $(Build.SourcesDirectory) @@ -73,7 +73,7 @@ extends: - bash: | cd $(enterpriseTestsSetup) - docker-compose down + docker compose down displayName: Stop test network and machines env: DOTNET_RUNTIME_REPO_ROOT: $(Build.SourcesDirectory) diff --git a/eng/pipelines/libraries/stress/http.yml b/eng/pipelines/libraries/stress/http.yml index adb5667a7bf743..ead429394df38a 100644 --- a/eng/pipelines/libraries/stress/http.yml +++ b/eng/pipelines/libraries/stress/http.yml @@ -69,7 +69,7 @@ extends: export STRESS_CLIENT_ARGS="$HTTPSTRESS_CLIENT_ARGS -http 3.0" export STRESS_SERVER_ARGS="$HTTPSTRESS_SERVER_ARGS -http 3.0" mkdir -p $DUMPS_SHARE - docker-compose up --abort-on-container-exit --no-color + docker compose up --abort-on-container-exit --no-color timeoutInMinutes: 35 # In case the HTTP/3.0 run hangs, we timeout shortly after the expected 30 minute run displayName: Run HttpStress - HTTP 3.0 condition: and(eq(variables['buildRuntime.succeeded'], 'true'), eq(variables['buildStress.succeeded'], 'true')) @@ -79,8 +79,8 @@ extends: export STRESS_CLIENT_ARGS="$HTTPSTRESS_CLIENT_ARGS -http 2.0" export STRESS_SERVER_ARGS="$HTTPSTRESS_SERVER_ARGS -http 2.0" mkdir -p $DUMPS_SHARE - docker-compose down - docker-compose up --abort-on-container-exit --no-color + docker compose down + 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')) @@ -89,8 +89,8 @@ extends: export STRESS_CLIENT_ARGS="$HTTPSTRESS_CLIENT_ARGS -http 1.1" export STRESS_SERVER_ARGS="$HTTPSTRESS_SERVER_ARGS -http 1.1" mkdir -p $DUMPS_SHARE - docker-compose down - docker-compose up --abort-on-container-exit --no-color + docker compose down + 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 089a10adae12cf..52e1d07748b27e 100644 --- a/eng/pipelines/libraries/stress/ssl.yml +++ b/eng/pipelines/libraries/stress/ssl.yml @@ -66,7 +66,7 @@ extends: export STRESS_CLIENT_ARGS=$SSLSTRESS_CLIENT_ARGS export STRESS_SERVER_ARGS=$SSLSTRESS_SERVER_ARGS mkdir -p $DUMPS_SHARE - 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.sh b/src/libraries/Common/tests/System/Net/StressTests/run-docker-compose.sh index 6b50a01f5d2ffa..9db8f7f5b59d7a 100755 --- a/src/libraries/Common/tests/System/Net/StressTests/run-docker-compose.sh +++ b/src/libraries/Common/tests/System/Net/StressTests/run-docker-compose.sh @@ -1,5 +1,5 @@ #!/usr/bin/env bash -# Runs the stress test using docker-compose +# Runs the stress test using docker compose # Stop script if unbound variable found (use ${var:-} if intentional) set -u @@ -100,7 +100,7 @@ if [[ "$nobuild" -eq 0 ]]; then build_args="$build_args --build-arg SDK_BASE_IMAGE=$imagename" fi - if ! docker-compose --file "$compose_file" build $build_args; then + if ! docker compose --file "$compose_file" build $build_args; then exit $? fi fi @@ -113,6 +113,6 @@ if [[ "$buildonly" -eq 0 ]]; then export STRESS_CLIENT_ARGS=$clientstressargs export STRESS_SERVER_ARGS=$serverstressargs - docker-compose --file "$compose_file" up --abort-on-container-exit + docker compose --file "$compose_file" up --abort-on-container-exit exit $? fi