Skip to content

Commit cc1ae2b

Browse files
ManickaPCopilot
andauthored
[HTTP/SSL] Revert docker-compose command changes from PR #125995 (#126399)
# Revert `docker-compose` command changes from #125995 > [!NOTE] > This PR was AI/Copilot-generated. Reverts the `docker-compose` → `docker compose` command changes introduced in #125995, while keeping the Azure Linux 3 image pool swap (`Build.Ubuntu.2204.Amd64.Open` → `build.azurelinux.3.amd64.open`). ## What is reverted All `docker-compose` (hyphenated) → `docker compose` (space-separated) changes across 5 files: - `eng/pipelines/libraries/enterprise/linux.yml` - `eng/pipelines/libraries/stress/http.yml` - `eng/pipelines/libraries/stress/ssl.yml` - `src/libraries/Common/tests/System/Net/StressTests/run-docker-compose.ps1` - `src/libraries/Common/tests/System/Net/StressTests/run-docker-compose.sh` ## What is kept The image pool migration in the 3 pipeline YAML files: `Build.Ubuntu.2204.Amd64.Open` → `build.azurelinux.3.amd64.open` Ref #125995, #125748, #125690 --------- Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
1 parent 9394358 commit cc1ae2b

3 files changed

Lines changed: 14 additions & 12 deletions

File tree

eng/pipelines/libraries/stress/http.yml

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,8 @@ trigger: none
33
pr:
44
branches:
55
include:
6-
- "*"
6+
- main
7+
- release/*.0
78
paths:
89
include:
910
- src/libraries/System.Net.Http/tests/StressTests/HttpStress/**
@@ -143,7 +144,7 @@ extends:
143144
$env:STRESS_CLIENT_ARGS = "$env:HTTPSTRESS_CLIENT_ARGS -http 3.0"
144145
$env:STRESS_SERVER_ARGS = "$env:HTTPSTRESS_SERVER_ARGS -http 3.0"
145146
New-Item -Force $env:DUMPS_SHARE -ItemType Directory
146-
docker compose up --abort-on-container-exit --no-color
147+
docker-compose up --abort-on-container-exit --no-color
147148
displayName: Run HttpStress - HTTP 3.0
148149
condition: and(eq(variables['buildRuntime.succeeded'], 'true'), eq(variables['buildStress.succeeded'], 'true'))
149150
@@ -152,7 +153,7 @@ extends:
152153
$env:STRESS_CLIENT_ARGS = "$env:HTTPSTRESS_CLIENT_ARGS -http 2.0"
153154
$env:STRESS_SERVER_ARGS = "$env:HTTPSTRESS_SERVER_ARGS -http 2.0"
154155
New-Item -Force $env:DUMPS_SHARE -ItemType Directory
155-
docker compose up --abort-on-container-exit --no-color
156+
docker-compose up --abort-on-container-exit --no-color
156157
displayName: Run HttpStress - HTTP 2.0
157158
condition: and(eq(variables['buildRuntime.succeeded'], 'true'), eq(variables['buildStress.succeeded'], 'true'))
158159
@@ -161,7 +162,7 @@ extends:
161162
$env:STRESS_CLIENT_ARGS = "$env:HTTPSTRESS_CLIENT_ARGS -http 1.1"
162163
$env:STRESS_SERVER_ARGS = "$env:HTTPSTRESS_SERVER_ARGS -http 1.1"
163164
New-Item -Force $env:DUMPS_SHARE -ItemType Directory
164-
docker compose up --abort-on-container-exit --no-color
165+
docker-compose up --abort-on-container-exit --no-color
165166
displayName: Run HttpStress - HTTP 1.1
166167
condition: and(eq(variables['buildRuntime.succeeded'], 'true'), eq(variables['buildStress.succeeded'], 'true'))
167168

eng/pipelines/libraries/stress/ssl.yml

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,8 @@ trigger: none
33
pr:
44
branches:
55
include:
6-
- "*"
6+
- main
7+
- release/*.0
78
paths:
89
include:
910
- src/libraries/System.Net.Security/tests/StressTests/SslStress/**
@@ -101,7 +102,7 @@ extends:
101102
$env:STRESS_CLIENT_ARGS = $env:SSLSTRESS_CLIENT_ARGS
102103
$env:STRESS_SERVER_ARGS = $env:SSLSTRESS_SERVER_ARGS
103104
New-Item -Force $env:DUMPS_SHARE -ItemType Directory
104-
docker compose up --abort-on-container-exit --no-color
105+
docker-compose up --abort-on-container-exit --no-color
105106
displayName: Run SslStress
106107
107108
- publish: $(Build.ArtifactStagingDirectory)/dumps

src/libraries/Common/tests/System/Net/StressTests/run-docker-compose.ps1

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
#!/usr/bin/env pwsh
2-
# Runs the stress test using docker compose
2+
# Runs the stress test using docker-compose
33

44
[CmdletBinding(PositionalBinding = $false)]
55
Param(
@@ -50,7 +50,7 @@ if ($useWindowsContainers) {
5050
}
5151

5252
if (!$noBuild) {
53-
# Dockerize the stress app using docker compose
53+
# Dockerize the stress app using docker-compose
5454
$BuildArgs = @(
5555
"--build-arg", "VERSION=$Version",
5656
"--build-arg", "CONFIGURATION=$configuration"
@@ -61,10 +61,10 @@ if (!$noBuild) {
6161
$originalErrorPreference = $ErrorActionPreference
6262
$ErrorActionPreference = 'Continue'
6363
try {
64-
write-output "docker compose --file $COMPOSE_FILE build $buildArgs"
65-
docker compose --file $COMPOSE_FILE build @buildArgs 2>&1
64+
write-output "docker-compose --file $COMPOSE_FILE build $buildArgs"
65+
docker-compose --file $COMPOSE_FILE build @buildArgs 2>&1
6666
if ($LASTEXITCODE -ne 0) {
67-
throw "docker compose exited with error code $LASTEXITCODE"
67+
throw "docker-compose exited with error code $LASTEXITCODE"
6868
}
6969
}
7070
finally {
@@ -86,5 +86,5 @@ if (!$buildOnly) {
8686

8787
$env:STRESS_CLIENT_ARGS = $clientStressArgs
8888
$env:STRESS_SERVER_ARGS = $serverStressArgs
89-
docker compose --file "$COMPOSE_FILE" up --abort-on-container-exit
89+
docker-compose --file "$COMPOSE_FILE" up --abort-on-container-exit
9090
}

0 commit comments

Comments
 (0)