Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
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
7 changes: 2 additions & 5 deletions .azure/pipelines/ci-public.yml
Original file line number Diff line number Diff line change
Expand Up @@ -295,7 +295,6 @@ stages:
jobName: Linux_x64_build
jobDisplayName: "Build: Linux x64"
agentOs: Linux
useHostedUbuntu: false
steps:
- script: ./eng/build.sh
--ci
Expand Down Expand Up @@ -328,6 +327,7 @@ stages:
jobName: Linux_arm_build
jobDisplayName: "Build: Linux ARM"
agentOs: Linux
useHostedUbuntu: true
buildArgs:
--arch arm
--pack
Expand Down Expand Up @@ -359,6 +359,7 @@ stages:
jobName: Linux_arm64_build
jobDisplayName: "Build: Linux ARM64"
agentOs: Linux
useHostedUbuntu: true
steps:
- script: ./eng/build.sh
--ci
Expand Down Expand Up @@ -391,7 +392,6 @@ stages:
jobName: Linux_musl_x64_build
jobDisplayName: "Build: Linux Musl x64"
agentOs: Linux
useHostedUbuntu: false
container: mcr.microsoft.com/dotnet-buildtools/prereqs:azurelinux-3.0-net10.0-build-amd64
buildArgs:
--arch x64
Expand Down Expand Up @@ -426,7 +426,6 @@ stages:
jobName: Linux_musl_arm_build
jobDisplayName: "Build: Linux Musl ARM"
agentOs: Linux
useHostedUbuntu: false
container: mcr.microsoft.com/dotnet-buildtools/prereqs:azurelinux-3.0-net10.0-build-amd64
buildArgs:
--arch arm
Expand Down Expand Up @@ -460,7 +459,6 @@ stages:
jobName: Linux_musl_arm64_build
jobDisplayName: "Build: Linux Musl ARM64"
agentOs: Linux
useHostedUbuntu: false
container: mcr.microsoft.com/dotnet-buildtools/prereqs:azurelinux-3.0-net10.0-build-amd64
buildArgs:
--arch arm64
Expand Down Expand Up @@ -544,7 +542,6 @@ stages:
jobDisplayName: "Test: Ubuntu x64"
agentOs: Linux
isAzDOTestingJob: true
useHostedUbuntu: false
buildArgs: --all --test --binaryLog /p:RunTemplateTests=false /p:SkipHelixReadyTests=true $(_InternalRuntimeDownloadArgs)
beforeBuild:
- bash: "./eng/scripts/install-nginx.sh"
Expand Down
7 changes: 2 additions & 5 deletions .azure/pipelines/ci-unofficial.yml
Original file line number Diff line number Diff line change
Expand Up @@ -314,7 +314,6 @@ extends:
jobName: Linux_x64_build
jobDisplayName: "Build: Linux x64"
agentOs: Linux
useHostedUbuntu: false
beforeBuild:
- script: git submodule update --init
displayName: Update submodules
Expand Down Expand Up @@ -349,6 +348,7 @@ extends:
jobName: Linux_arm_build
jobDisplayName: "Build: Linux ARM"
agentOs: Linux
useHostedUbuntu: true
beforeBuild:
- script: git submodule update --init
displayName: Update submodules
Expand Down Expand Up @@ -382,6 +382,7 @@ extends:
jobName: Linux_arm64_build
jobDisplayName: "Build: Linux ARM64"
agentOs: Linux
useHostedUbuntu: true
beforeBuild:
- script: git submodule update --init
displayName: Update submodules
Expand Down Expand Up @@ -416,7 +417,6 @@ extends:
jobName: Linux_musl_x64_build
jobDisplayName: "Build: Linux Musl x64"
agentOs: Linux
useHostedUbuntu: false
container: azureLinux30Net10BuildAmd64
beforeBuild:
- script: git submodule update --init
Expand Down Expand Up @@ -453,7 +453,6 @@ extends:
jobName: Linux_musl_arm_build
jobDisplayName: "Build: Linux Musl ARM"
agentOs: Linux
useHostedUbuntu: false
container: azureLinux30Net10BuildAmd64
beforeBuild:
- script: git submodule update --init
Expand Down Expand Up @@ -489,7 +488,6 @@ extends:
jobName: Linux_musl_arm64_build
jobDisplayName: "Build: Linux Musl ARM64"
agentOs: Linux
useHostedUbuntu: false
container: azureLinux30Net10BuildAmd64
beforeBuild:
- script: git submodule update --init
Expand Down Expand Up @@ -577,7 +575,6 @@ extends:
jobDisplayName: "Test: Ubuntu x64"
agentOs: Linux
isAzDOTestingJob: true
useHostedUbuntu: false
buildArgs: --all --test --binaryLog /p:RunTemplateTests=false /p:SkipHelixReadyTests=true $(_InternalRuntimeDownloadArgs)
beforeBuild:
- script: git submodule update --init
Expand Down
7 changes: 2 additions & 5 deletions .azure/pipelines/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -328,7 +328,6 @@ extends:
jobName: Linux_x64_build
jobDisplayName: "Build: Linux x64"
agentOs: Linux
useHostedUbuntu: false
buildArgs:
--arch x64
--pack
Expand Down Expand Up @@ -361,6 +360,7 @@ extends:
jobName: Linux_arm_build
jobDisplayName: "Build: Linux ARM"
agentOs: Linux
useHostedUbuntu: true
buildArgs:
--arch arm
--pack
Expand Down Expand Up @@ -392,6 +392,7 @@ extends:
jobName: Linux_arm64_build
jobDisplayName: "Build: Linux ARM64"
agentOs: Linux
useHostedUbuntu: true
buildArgs:
--arch arm64
--pack
Expand Down Expand Up @@ -424,7 +425,6 @@ extends:
jobName: Linux_musl_x64_build
jobDisplayName: "Build: Linux Musl x64"
agentOs: Linux
useHostedUbuntu: false
container: azureLinux30Net10BuildAmd64
buildArgs:
--arch x64
Expand Down Expand Up @@ -459,7 +459,6 @@ extends:
jobName: Linux_musl_arm_build
jobDisplayName: "Build: Linux Musl ARM"
agentOs: Linux
useHostedUbuntu: false
container: azureLinux30Net10BuildAmd64
buildArgs:
--arch arm
Expand Down Expand Up @@ -493,7 +492,6 @@ extends:
jobName: Linux_musl_arm64_build
jobDisplayName: "Build: Linux Musl ARM64"
agentOs: Linux
useHostedUbuntu: false
container: azureLinux30Net10BuildAmd64
buildArgs:
--arch arm64
Expand Down Expand Up @@ -574,7 +572,6 @@ extends:
jobDisplayName: "Test: Ubuntu x64"
agentOs: Linux
isAzDOTestingJob: true
useHostedUbuntu: false
buildArgs: --all --test --binaryLog /p:RunTemplateTests=false /p:SkipHelixReadyTests=true $(_InternalRuntimeDownloadArgs)
beforeBuild:
- bash: "./eng/scripts/install-nginx.sh"
Expand Down
1 change: 1 addition & 0 deletions .azure/pipelines/components-e2e-tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,7 @@ jobs:
jobName: Components_E2E_Test
jobDisplayName: "Test: Blazor E2E tests on Linux"
agentOs: Linux
useHostedUbuntu: true
isAzDOTestingJob: true
enablePublishTestResults: false
timeoutInMinutes: 120
Expand Down
16 changes: 11 additions & 5 deletions .azure/pipelines/jobs/default-build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@ parameters:
installNodeJs: true
timeoutInMinutes: 180
testRunTitle: $(AgentOsName)-$(BuildConfiguration)
useHostedUbuntu: true
useHostedUbuntu: false
# Checkout optimization parameters
fetchDepth: 1
fetchTags: false
Expand Down Expand Up @@ -109,7 +109,8 @@ jobs:
vmImage: macOS-15
${{ if eq(parameters.agentOs, 'Linux') }}:
${{ if eq(parameters.useHostedUbuntu, true) }}:
vmImage: ubuntu-22.04
name: $(DncEngPublicBuildPool)
demands: ImageOverride -equals 1es-ubuntu-2204-open
${{ else }}:
name: $(DncEngPublicBuildPool)
demands: ImageOverride -equals Build.Ubuntu.2204.Amd64.Open
Expand Down Expand Up @@ -328,9 +329,14 @@ jobs:
image: macOS-15
os: macOS
${{ if eq(parameters.agentOs, 'Linux') }}:
name: $(DncEngInternalBuildPool)
image: 1es-ubuntu-2204
os: linux
${{ if eq(parameters.useHostedUbuntu, true) }}:
name: $(DncEngInternalBuildPool)
image: 1es-ubuntu-2204
os: linux
${{ else }}:
name: $(DncEngInternalBuildPool)
image: Build.Ubuntu.2204
os: linux
${{ if eq(parameters.agentOs, 'Windows') }}:
name: $(DncEngInternalBuildPool)
# Visual Studio Enterprise - contains some stuff, like SQL Server and IIS Express, that we use for testing
Expand Down
1 change: 0 additions & 1 deletion .azure/pipelines/quarantined-pr.yml
Original file line number Diff line number Diff line change
Expand Up @@ -151,7 +151,6 @@ jobs:
timeoutInMinutes: 60
isAzDOTestingJob: true
enablePublishTestResults: false
useHostedUbuntu: false
steps:
- bash: ./eng/build.sh --ci --nobl --all --no-build-java --pack
displayName: Build
Expand Down
Loading