Skip to content

Commit b0ed40a

Browse files
authored
Use prebuilt docker images instead of installing dependencies on every run (#9671)
2 parents d5fe3d0 + ffde585 commit b0ed40a

4 files changed

Lines changed: 4 additions & 39 deletions

File tree

azure-pipelines.yml

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -86,11 +86,10 @@ stages:
8686
# Prefer the dotnet from the container.
8787
installDotNet: false
8888
testVSCodeVersion: $(testVSCodeVersion)
89-
installAdditionalLinuxDependencies: true
9089
pool:
9190
name: NetCore-Public
9291
demands: ImageOverride -equals build.ubuntu.2204.amd64.open
93-
containerName: mcr.microsoft.com/dotnet/sdk:8.0-noble
92+
containerName: mcr.microsoft.com/dotnet-buildtools/prereqs:ubuntu-24.04-net8.0-vscode-csharp-amd64
9493

9594
- stage:
9695
displayName: Test Linux (.NET 9)
@@ -104,11 +103,10 @@ stages:
104103
# Prefer the dotnet from the container.
105104
installDotNet: false
106105
testVSCodeVersion: $(testVSCodeVersion)
107-
installAdditionalLinuxDependencies: true
108106
pool:
109107
name: NetCore-Public
110108
demands: ImageOverride -equals build.ubuntu.2204.amd64.open
111-
containerName: mcr.microsoft.com/dotnet/sdk:9.0-noble
109+
containerName: mcr.microsoft.com/dotnet-buildtools/prereqs:ubuntu-24.04-net9.0-vscode-csharp-amd64
112110

113111
- stage:
114112
displayName: Test Linux (.NET 10)
@@ -120,11 +118,10 @@ stages:
120118
# Prefer the dotnet from the container.
121119
installDotNet: false
122120
testVSCodeVersion: $(testVSCodeVersion)
123-
installAdditionalLinuxDependencies: true
124121
pool:
125122
name: NetCore-Public
126123
demands: ImageOverride -equals build.ubuntu.2204.amd64.open
127-
containerName: mcr.microsoft.com/dotnet/sdk:10.0-noble
124+
containerName: mcr.microsoft.com/dotnet-buildtools/prereqs:ubuntu-24.04-net10.0-vscode-csharp-amd64
128125

129126
- stage:
130127
displayName: Test Linux (.NET 11)
@@ -136,11 +133,10 @@ stages:
136133
# Prefer the dotnet from the container.
137134
installDotNet: false
138135
testVSCodeVersion: $(testVSCodeVersion)
139-
installAdditionalLinuxDependencies: true
140136
pool:
141137
name: NetCore-Public
142138
demands: ImageOverride -equals build.ubuntu.2204.amd64.open
143-
containerName: mcr.microsoft.com/dotnet/sdk:11.0-preview
139+
containerName: mcr.microsoft.com/dotnet-buildtools/prereqs:ubuntu-26.04-net11.0-vscode-csharp-amd64
144140

145141
- stage: Test_Windows_Stage
146142
displayName: Test Windows

azure-pipelines/test-linux-docker-prereqs.yml

Lines changed: 0 additions & 19 deletions
This file was deleted.

azure-pipelines/test-matrix.yml

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,6 @@ parameters:
88
default: ''
99
- name: installDotNet
1010
type: boolean
11-
- name: installAdditionalLinuxDependencies
12-
type: boolean
13-
default: false
1411
- name: testVSCodeVersion
1512
type: string
1613

@@ -40,7 +37,6 @@ jobs:
4037
- template: /azure-pipelines/test.yml@self
4138
parameters:
4239
installDotNet: ${{ parameters.installDotNet }}
43-
installAdditionalLinuxDependencies: ${{ parameters.installAdditionalLinuxDependencies }}
4440
npmCommand: $(npmCommand)
4541
testVSCodeVersion: ${{ parameters.testVSCodeVersion }}
4642
isIntegration: $(isIntegration)

azure-pipelines/test.yml

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,6 @@
11
parameters:
22
- name: installDotNet
33
type: boolean
4-
- name: installAdditionalLinuxDependencies
5-
type: boolean
6-
default: false
74
- name: npmCommand
85
type: string
96
- name: testVSCodeVersion
@@ -22,12 +19,7 @@ steps:
2219
parameters:
2320
installDotNet: ${{ parameters.installDotNet }}
2421

25-
- ${{ if eq(parameters.installAdditionalLinuxDependencies, true) }}:
26-
- template: test-linux-docker-prereqs.yml
27-
2822
- template: test-prereqs.yml
29-
parameters:
30-
installAdditionalLinuxDependencies: ${{ parameters.installAdditionalLinuxDependencies }}
3123

3224
- script: npm run ${{ parameters.npmCommand }}
3325
displayName: 🧪 Run $(Agent.JobName)

0 commit comments

Comments
 (0)