Skip to content

Commit 1987829

Browse files
authored
[ci] Move CI builds to 1ES's hardened images. (#953)
1 parent cbd9666 commit 1987829

File tree

1 file changed

+14
-6
lines changed

1 file changed

+14
-6
lines changed

build-tools/automation/azure-pipelines.yaml

Lines changed: 14 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -22,16 +22,20 @@ variables:
2222
Build.Configuration: Release
2323
MaxJdkVersion: 8
2424
DotNetCoreVersion: 6.0.x
25-
HostedMacImage: macOS-10.15
26-
HostedWinImage: windows-2022
25+
1ESWindowsPool: AzurePipelines-EO
26+
1ESWindowsImage: AzurePipelinesWindows2022compliant
27+
1ESMacPool: Azure Pipelines
28+
1ESMacImage: internal-macos-11
2729
NetCoreTargetFrameworkPathSuffix: -net6.0
2830
VSInstallRoot: C:\Program Files\Microsoft Visual Studio\2022\Enterprise
2931

3032
jobs:
3133
- job: windows_build
3234
displayName: Windows - .NET Framework
3335
pool:
34-
vmImage: $(HostedWinImage)
36+
name: $(1ESWindowsPool)
37+
demands:
38+
- ImageOverride -equals $(1ESWindowsImage)
3539
timeoutInMinutes: 20
3640
workspace:
3741
clean: all
@@ -77,7 +81,9 @@ jobs:
7781
- job: windows_dotnet_build
7882
displayName: Windows - .NET Core
7983
pool:
80-
vmImage: $(HostedWinImage)
84+
name: $(1ESWindowsPool)
85+
demands:
86+
- ImageOverride -equals $(1ESWindowsImage)
8187
timeoutInMinutes: 20
8288
workspace:
8389
clean: all
@@ -114,7 +120,8 @@ jobs:
114120
- job: mac_build
115121
displayName: Mac - Mono
116122
pool:
117-
vmImage: $(HostedMacImage)
123+
name: $(1ESMacPool)
124+
vmImage: $(1ESMacImage)
118125
timeoutInMinutes: 20
119126
workspace:
120127
clean: all
@@ -166,7 +173,8 @@ jobs:
166173
- job: mac_dotnet_build
167174
displayName: Mac - .NET Core
168175
pool:
169-
vmImage: $(HostedMacImage)
176+
name: $(1ESMacPool)
177+
vmImage: $(1ESMacImage)
170178
timeoutInMinutes: 20
171179
workspace:
172180
clean: all

0 commit comments

Comments
 (0)