Skip to content

Commit bde19aa

Browse files
richlanderCopilot
richlander
and
Copilot
authored
Move remaining Linux build pools from Ubuntu 22.04 to Azure Linux 3 (#125995)
> [!NOTE] > This PR was AI/Copilot-generated. Update enterprise and stress test build pool images from Ubuntu 22.04 to Azure Linux 3: - `enterprise/linux.yml` - `stress/http.yml` - `stress/ssl.yml` `Build.Ubuntu.2204.Amd64.Open` → `build.azurelinux.3.amd64.open` These were missed in #125535. Companion release/10.0 PR to follow. Ref #125748, #125690 --------- Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
1 parent cdddcee commit bde19aa

5 files changed

Lines changed: 25 additions & 25 deletions

File tree

‎eng/pipelines/libraries/enterprise/linux.yml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -39,18 +39,18 @@ extends:
3939
timeoutInMinutes: 120
4040
pool:
4141
name: $(DncEngPublicBuildPool)
42-
demands: ImageOverride -equals Build.Ubuntu.2204.Amd64.Open
42+
demands: ImageOverride -equals build.azurelinux.3.amd64.open
4343
steps:
4444
- bash: |
4545
cd $(enterpriseTestsSetup)
46-
docker-compose build
46+
docker compose build
4747
displayName: Build test machine images
4848
env:
4949
DOTNET_RUNTIME_REPO_ROOT: $(Build.SourcesDirectory)
5050
5151
- bash: |
5252
cd $(enterpriseTestsSetup)
53-
docker-compose up -d
53+
docker compose up -d
5454
displayName: Start test network and machines
5555
env:
5656
DOTNET_RUNTIME_REPO_ROOT: $(Build.SourcesDirectory)
@@ -73,7 +73,7 @@ extends:
7373
7474
- bash: |
7575
cd $(enterpriseTestsSetup)
76-
docker-compose down
76+
docker compose down
7777
displayName: Stop test network and machines
7878
env:
7979
DOTNET_RUNTIME_REPO_ROOT: $(Build.SourcesDirectory)

‎eng/pipelines/libraries/stress/http.yml‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ extends:
3838
DUMPS_SHARE: "$(Build.ArtifactStagingDirectory)/dumps/"
3939
pool:
4040
name: $(DncEngPublicBuildPool)
41-
demands: ImageOverride -equals Build.Ubuntu.2204.Amd64.Open
41+
demands: ImageOverride -equals build.azurelinux.3.amd64.open
4242

4343
steps:
4444
- checkout: self
@@ -63,7 +63,7 @@ extends:
6363
export STRESS_CLIENT_ARGS="$HTTPSTRESS_CLIENT_ARGS -http 3.0"
6464
export STRESS_SERVER_ARGS="$HTTPSTRESS_SERVER_ARGS -http 3.0"
6565
mkdir -p $DUMPS_SHARE
66-
docker-compose up --abort-on-container-exit --no-color
66+
docker compose up --abort-on-container-exit --no-color
6767
timeoutInMinutes: 35 # In case the HTTP/3.0 run hangs, we timeout shortly after the expected 30 minute run
6868
displayName: Run HttpStress - HTTP 3.0
6969
condition: and(eq(variables['buildRuntime.succeeded'], 'true'), eq(variables['buildStress.succeeded'], 'true'))
@@ -73,8 +73,8 @@ extends:
7373
export STRESS_CLIENT_ARGS="$HTTPSTRESS_CLIENT_ARGS -http 2.0"
7474
export STRESS_SERVER_ARGS="$HTTPSTRESS_SERVER_ARGS -http 2.0"
7575
mkdir -p $DUMPS_SHARE
76-
docker-compose down
77-
docker-compose up --abort-on-container-exit --no-color
76+
docker compose down
77+
docker compose up --abort-on-container-exit --no-color
7878
displayName: Run HttpStress - HTTP 2.0
7979
condition: and(eq(variables['buildRuntime.succeeded'], 'true'), eq(variables['buildStress.succeeded'], 'true'))
8080
@@ -83,8 +83,8 @@ extends:
8383
export STRESS_CLIENT_ARGS="$HTTPSTRESS_CLIENT_ARGS -http 1.1"
8484
export STRESS_SERVER_ARGS="$HTTPSTRESS_SERVER_ARGS -http 1.1"
8585
mkdir -p $DUMPS_SHARE
86-
docker-compose down
87-
docker-compose up --abort-on-container-exit --no-color
86+
docker compose down
87+
docker compose up --abort-on-container-exit --no-color
8888
displayName: Run HttpStress - HTTP 1.1
8989
condition: and(eq(variables['buildRuntime.succeeded'], 'true'), eq(variables['buildStress.succeeded'], 'true'))
9090
@@ -138,7 +138,7 @@ extends:
138138
$env:STRESS_CLIENT_ARGS = "$env:HTTPSTRESS_CLIENT_ARGS -http 3.0"
139139
$env:STRESS_SERVER_ARGS = "$env:HTTPSTRESS_SERVER_ARGS -http 3.0"
140140
New-Item -Force $env:DUMPS_SHARE -ItemType Directory
141-
docker-compose up --abort-on-container-exit --no-color
141+
docker compose up --abort-on-container-exit --no-color
142142
displayName: Run HttpStress - HTTP 3.0
143143
condition: and(eq(variables['buildRuntime.succeeded'], 'true'), eq(variables['buildStress.succeeded'], 'true'))
144144
@@ -147,7 +147,7 @@ extends:
147147
$env:STRESS_CLIENT_ARGS = "$env:HTTPSTRESS_CLIENT_ARGS -http 2.0"
148148
$env:STRESS_SERVER_ARGS = "$env:HTTPSTRESS_SERVER_ARGS -http 2.0"
149149
New-Item -Force $env:DUMPS_SHARE -ItemType Directory
150-
docker-compose up --abort-on-container-exit --no-color
150+
docker compose up --abort-on-container-exit --no-color
151151
displayName: Run HttpStress - HTTP 2.0
152152
condition: and(eq(variables['buildRuntime.succeeded'], 'true'), eq(variables['buildStress.succeeded'], 'true'))
153153
@@ -156,7 +156,7 @@ extends:
156156
$env:STRESS_CLIENT_ARGS = "$env:HTTPSTRESS_CLIENT_ARGS -http 1.1"
157157
$env:STRESS_SERVER_ARGS = "$env:HTTPSTRESS_SERVER_ARGS -http 1.1"
158158
New-Item -Force $env:DUMPS_SHARE -ItemType Directory
159-
docker-compose up --abort-on-container-exit --no-color
159+
docker compose up --abort-on-container-exit --no-color
160160
displayName: Run HttpStress - HTTP 1.1
161161
condition: and(eq(variables['buildRuntime.succeeded'], 'true'), eq(variables['buildStress.succeeded'], 'true'))
162162

‎eng/pipelines/libraries/stress/ssl.yml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ extends:
3939
DUMPS_SHARE: "$(Build.ArtifactStagingDirectory)/dumps/"
4040
pool:
4141
name: $(DncEngPublicBuildPool)
42-
demands: ImageOverride -equals Build.Ubuntu.2204.Amd64.Open
42+
demands: ImageOverride -equals build.azurelinux.3.amd64.open
4343

4444
steps:
4545
- checkout: self
@@ -60,7 +60,7 @@ extends:
6060
export STRESS_CLIENT_ARGS=$SSLSTRESS_CLIENT_ARGS
6161
export STRESS_SERVER_ARGS=$SSLSTRESS_SERVER_ARGS
6262
mkdir -p $DUMPS_SHARE
63-
docker-compose up --abort-on-container-exit --no-color
63+
docker compose up --abort-on-container-exit --no-color
6464
displayName: Run SslStress
6565
6666
- publish: $(Build.ArtifactStagingDirectory)/dumps
@@ -96,7 +96,7 @@ extends:
9696
$env:STRESS_CLIENT_ARGS = $env:SSLSTRESS_CLIENT_ARGS
9797
$env:STRESS_SERVER_ARGS = $env:SSLSTRESS_SERVER_ARGS
9898
New-Item -Force $env:DUMPS_SHARE -ItemType Directory
99-
docker-compose up --abort-on-container-exit --no-color
99+
docker compose up --abort-on-container-exit --no-color
100100
displayName: Run SslStress
101101
102102
- 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
}

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

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

44
# Stop script if unbound variable found (use ${var:-} if intentional)
55
set -u
@@ -100,7 +100,7 @@ if [[ "$nobuild" -eq 0 ]]; then
100100
build_args="$build_args --build-arg SDK_BASE_IMAGE=$imagename"
101101
fi
102102

103-
if ! docker-compose --file "$compose_file" build $build_args; then
103+
if ! docker compose --file "$compose_file" build $build_args; then
104104
exit $?
105105
fi
106106
fi
@@ -113,6 +113,6 @@ if [[ "$buildonly" -eq 0 ]]; then
113113

114114
export STRESS_CLIENT_ARGS=$clientstressargs
115115
export STRESS_SERVER_ARGS=$serverstressargs
116-
docker-compose --file "$compose_file" up --abort-on-container-exit
116+
docker compose --file "$compose_file" up --abort-on-container-exit
117117
exit $?
118118
fi

0 commit comments

Comments
 (0)