Skip to content

Commit 1d1ed30

Browse files
committed
[ci] Use new 1ES Hosted win2019 Pool
Context: https://www.1eswiki.com/wiki/1ES_hosted_AzureDevOps_Agents We've been tasked with migrating away from our scale set agent pools to a new 1ES service. There are a couple of benefits to using 1ES agent pools. We should now be able to use customizable versions of the [Microsoft-hosted agent images][0] which come preloaded with some of our dependencies. These images are also updated regularly which should hopefully reduce maintenance costs. Overall, the process for creating, updating, and rolling out image changes to our scale set agent pools should now be dramatically simplified over [the existing workflow][1]. Visual Studio update steps have been removed as these images should stay up to date with the latest stable VS, similar to the Microsoft-hosted images. [0]: https://docs.microsoft.com/en-us/azure/devops/pipelines/agents/hosted?view=azure-devops&tabs=yaml [1]: https://github.com/xamarin/monodroid/wiki/Azure-Pipelines-and-DevOps#windows-scale-set-agent-pool-management
1 parent d80c9b1 commit 1d1ed30

File tree

2 files changed

+1
-6
lines changed

2 files changed

+1
-6
lines changed

build-tools/automation/azure-pipelines.yaml

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ variables:
4242
DotNet6Version: 6.0.100-preview.3.21202.5
4343
HostedMacImage: macOS-10.15
4444
HostedWinVS2019: Hosted Windows 2019 with VS2019
45-
VSEngWinVS2019: Xamarin-Android-Win2019
45+
VSEngWinVS2019: android-win-2019
4646
# Run all tests if:
4747
# - User who queued the job requested it (They set XA.RunAllTests to true)
4848
# - This is the master integration branch (Pipeline defaults XA.RunAllTests to true)
@@ -171,8 +171,6 @@ stages:
171171

172172
- template: yaml-templates\clean.yaml
173173

174-
- template: yaml-templates\update-vs.yaml
175-
176174
- script: |
177175
echo ##vso[task.setvariable variable=JI_JAVA_HOME]%USERPROFILE%\android-toolchain\$(XA.Jdk11.Folder)
178176
displayName: set JI_JAVA_HOME
@@ -293,8 +291,6 @@ stages:
293291

294292
- template: yaml-templates\clean.yaml
295293

296-
- template: yaml-templates\update-vs.yaml
297-
298294
- script: |
299295
echo ##vso[task.setvariable variable=JI_JAVA_HOME]%USERPROFILE%\android-toolchain\$(XA.Jdk11.Folder)
300296
displayName: set JI_JAVA_HOME

build-tools/automation/yaml-templates/run-msbuild-win-tests.yaml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,6 @@ jobs:
2626

2727
- template: setup-test-environment.yaml
2828
parameters:
29-
updateVS: true
3029
jdkTestFolder: ${{ parameters.jdkTestFolder }}
3130

3231
- task: DownloadPipelineArtifact@1

0 commit comments

Comments
 (0)