Skip to content

Move remaining Linux build pools from Ubuntu 22.04 to Azure Linux 3 #125995

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
richlander merged 4 commits into from
Mar 25, 2026
+25 −25
Merged

Move remaining Linux build pools from Ubuntu 22.04 to Azure Linux 3 #125995

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
a52e8b3
Move remaining Linux build pools from Ubuntu 22.04 to Azure Linux 3
richlander Mar 23, 2026
88fc9b0
Use docker compose v2 (plugin) instead of docker-compose v1
richlander Mar 24, 2026
e131cc1
Merge branch 'main' into copilot/update-remaining-build-pools-azureli…
richlander Mar 24, 2026
1aab9e8
Update run-docker-compose scripts to use docker compose v2
richlander Mar 25, 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
8 changes: 4 additions & 4 deletions eng/pipelines/libraries/enterprise/linux.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,18 +39,18 @@ extends:
timeoutInMinutes: 120
pool:
name: $(DncEngPublicBuildPool)
demands: ImageOverride -equals Build.Ubuntu.2204.Amd64.Open
demands: ImageOverride -equals build.azurelinux.3.amd64.open
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)
Expand All @@ -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)
Expand Down
18 changes: 9 additions & 9 deletions eng/pipelines/libraries/stress/http.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ extends:
DUMPS_SHARE: "$(Build.ArtifactStagingDirectory)/dumps/"
pool:
name: $(DncEngPublicBuildPool)
demands: ImageOverride -equals Build.Ubuntu.2204.Amd64.Open
demands: ImageOverride -equals build.azurelinux.3.amd64.open

steps:
- checkout: self
Expand All @@ -63,7 +63,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'))
Expand All @@ -73,8 +73,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'))

Expand All @@ -83,8 +83,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'))

Expand Down Expand Up @@ -138,7 +138,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 @@ -147,7 +147,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 @@ -156,7 +156,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
6 changes: 3 additions & 3 deletions eng/pipelines/libraries/stress/ssl.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ extends:
DUMPS_SHARE: "$(Build.ArtifactStagingDirectory)/dumps/"
pool:
name: $(DncEngPublicBuildPool)
demands: ImageOverride -equals Build.Ubuntu.2204.Amd64.Open
demands: ImageOverride -equals build.azurelinux.3.amd64.open

steps:
- checkout: self
Expand All @@ -60,7 +60,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
Expand Down Expand Up @@ -96,7 +96,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
}
6 changes: 3 additions & 3 deletions src/libraries/Common/tests/System/Net/StressTests/run-docker-compose.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand Down Expand Up @@ -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
Expand All @@ -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
Loading