Skip to content

Commit

Permalink
Where applicable, update Windows pools used to `azsdk-pool-mms-win-20…
Browse files Browse the repository at this point in the history
…22-general` and rename `vmImage` to the `windows-20xx` format (#5493)

Where applicable, update Windows pools used to `azsdk-pool-mms-win-2022-general` and rename `vmImage` to the `windows-20xx` format.

This discussion explains why chose given `vmImage` format:

[Mike Harder: 1ES Hosted Pool image name changes](https://teams.microsoft.com/l/message/19:[email protected]/1676491855184?tenantId=72f988bf-86f1-41af-91ab-2d7cd011db47&groupId=3e17dcb0-4257-4a30-b843-77f47f1d4121&parentMessageId=1676491855184&teamName=Azure%20SDK&channelName=Engineering%20System%20%F0%9F%9B%A0%EF%B8%8F&createdTime=1676491855184)
posted in Azure SDK / Engineering System 🛠️ at Wednesday, February 15, 2023 12:10 PM

For further context, please see:
- #3407

Note that:
- searching for `MMS2021` returned no results
- searching for `azsdk-pool-mms-win-2019` returned no result except in a tool whose goal is to migrate such strings, hence nothing to do.
  • Loading branch information
Konrad Jamrozik authored Feb 17, 2023
1 parent 4e0fe68 commit 381c10f
Show file tree
Hide file tree
Showing 10 changed files with 12 additions and 12 deletions.
2 changes: 1 addition & 1 deletion doc/common/matrix_generator.md
Original file line number Diff line number Diff line change
Expand Up @@ -671,7 +671,7 @@ Given a matrix like below with `JavaTestVersion` marked as a non-sparse paramete
{
"matrix": {
"Agent": {
"windows-2022": { "OSVmImage": "MMS2022", "Pool": "azsdk-pool-mms-win-2022-general" },
"windows-2022": { "OSVmImage": "windows-2022", "Pool": "azsdk-pool-mms-win-2022-general" },
"ubuntu-2204": { "OSVmImage": "MMSUbuntu22.04", "Pool": "azsdk-pool-mms-ubuntu-2204-general" },
"macos-11": { "OSVmImage": "macos-11", "Pool": "Azure Pipelines" }
},
Expand Down
2 changes: 1 addition & 1 deletion eng/common-tests/matrix-generator/samples/matrix.json
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
],
"exclude": [
{
"OSVmImage": "MMS2022",
"OSVmImage": "windows-2022",
"framework": "netcoreapp2.1"
}
]
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ stages:
matrix:
Windows:
Pool: 'azsdk-pool-mms-win-2022-general'
Image: 'MMS2022'
Image: 'windows-2022'
Linux:
Pool: azsdk-pool-mms-ubuntu-2204-general
Image: MMSUbuntu22.04
Expand Down
2 changes: 1 addition & 1 deletion eng/pipelines/agent-pool-migration.yml
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,7 @@ parameters:
- MigrateFrom: windows2019
MigrateTo: windows2022
- MigrateFrom: MMS2019
MigrateTo: MMS2022
MigrateTo: windows-2022
- name: ShortForMigrateFrom
type: string
default: ''
Expand Down
2 changes: 1 addition & 1 deletion eng/pipelines/apiview-review-gen-swagger.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ trigger: none

pool:
name: azsdk-pool-mms-win-2022-general
vmImage: MMS2022
vmImage: windows-2022

variables:
SwaggerParserInstallPath: $(Pipeline.Workspace)/SwaggerApiParser
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ jobs:
- job: AzurePartnerDropsToNuget
pool:
name: azsdk-pool-mms-win-2022-general
vmImage: MMS2022
vmImage: windows-2022

steps:
- checkout: self
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -123,7 +123,7 @@ stages:
matrix:
Windows:
Pool: azsdk-pool-mms-win-2022-general
Image: MMS2022
Image: windows-2022
Linux:
Pool: azsdk-pool-mms-ubuntu-2204-general
Image: MMSUbuntu22.04
Expand Down
2 changes: 1 addition & 1 deletion src/dotnet/APIView/apiview-sync-staging.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ stages:
- job: 'BlobCopy'
pool:
name: azsdk-pool-mms-win-2022-general
vmImage: MMS2022
vmImage: windows-2022

steps:
- pwsh: |
Expand Down
4 changes: 2 additions & 2 deletions src/dotnet/APIView/apiview.yml
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ stages:

pool:
name: azsdk-pool-mms-win-2022-general
vmImage: MMS2022
vmImage: windows-2022

steps:
- task: NodeTool@0
Expand Down Expand Up @@ -142,7 +142,7 @@ stages:

pool:
name: azsdk-pool-mms-win-2022-general
vmImage: MMS2022
vmImage: windows-2022

steps:
- template: /eng/common/pipelines/templates/steps/cosmos-emulator.yml
Expand Down
4 changes: 2 additions & 2 deletions tools/apiview/parsers/cpp-api-parser/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ stages:
timeoutInMinutes: 300
pool:
name: azsdk-pool-mms-win-2022-general
vmImage: MMS2022
vmImage: windows-2022

steps:
- pwsh: |
Expand Down Expand Up @@ -105,7 +105,7 @@ stages:
environment: github
pool:
name: azsdk-pool-mms-win-2022-general
vmImage: MMS2022
vmImage: windows-2022

strategy:
runOnce:
Expand Down

0 comments on commit 381c10f

Please sign in to comment.