Skip to content

Commit c823a64

Browse files
authored
Migrate from win2019 to win2022 (Azure#24130)
1 parent 998aecd commit c823a64

File tree

7 files changed

+27
-19
lines changed

7 files changed

+27
-19
lines changed

eng/pipelines/aggregate-reports.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,8 @@ stages:
1414

1515
pool:
1616
# AzureFileCopy requires Windows
17-
name: azsdk-pool-mms-win-2019-general
18-
vmImage: MMS2019
17+
name: azsdk-pool-mms-win-2022-general
18+
vmImage: MMS2022
1919

2020
jobs:
2121
- job: GenerateReports
@@ -86,8 +86,8 @@ stages:
8686

8787
pool:
8888
# Policheck requires Windows
89-
name: azsdk-pool-mms-win-2019-general
90-
vmImage: MMS2019
89+
name: azsdk-pool-mms-win-2022-general
90+
vmImage: MMS2022
9191

9292
jobs:
9393
- job: ComplianceTools

eng/pipelines/npm-tasks.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ jobs:
5151
environment: npm
5252

5353
pool:
54-
vmImage: 'windows-2019'
54+
vmImage: 'windows-2022'
5555

5656
strategy:
5757
runOnce:

eng/pipelines/templates/jobs/ci.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -69,8 +69,8 @@ jobs:
6969

7070
- job: Compliance
7171
pool:
72-
name: azsdk-pool-mms-win-2019-general
73-
vmImage: MMS2019
72+
name: azsdk-pool-mms-win-2022-general
73+
vmImage: MMS2022
7474
steps:
7575
- template: /eng/common/pipelines/templates/steps/credscan.yml
7676
parameters:

eng/pipelines/templates/jobs/smoke.tests.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -62,8 +62,8 @@ jobs:
6262
ArmTemplateParameters: $(AzureCloudArmTemplateParameters)
6363
NodeTestVersion: "14.x"
6464
Windows Node16 (AzureCloud):
65-
Pool: "azsdk-pool-mms-win-2019-general"
66-
OSVmImage: "MMS2019"
65+
Pool: "azsdk-pool-mms-win-2022-general"
66+
OSVmImage: "MMS2022"
6767
SubscriptionConfiguration: $(sub-config-azure-cloud-test-resources)
6868
ArmTemplateParameters: $(AzureCloudArmTemplateParameters)
6969
NodeTestVersion: "16.x"
@@ -87,7 +87,7 @@ jobs:
8787
# NodeTestVersion: "12.x"
8888
# Windows Node14 (AzureUSGovernment):
8989
# Pool: Azure Pipelines
90-
# OSVmImage: "windows-2019"
90+
# OSVmImage: "windows-2022"
9191
# SubscriptionConfiguration: $(sub-config-gov-test-resources)
9292
# ArmTemplateParameters: $(AzureUSGovernmentArmTemplateParameters)
9393
# NodeTestVersion: "14.x"
@@ -99,7 +99,7 @@ jobs:
9999
# NodeTestVersion: "12.x"
100100
# Windows Node12 (AzureChinaCloud):
101101
# Pool: Azure Pipelines
102-
# OSVmImage: "windows-2019"
102+
# OSVmImage: "windows-2022"
103103
# SubscriptionConfiguration: $(sub-config-cn-test-resources)
104104
# ArmTemplateParameters: $(AzureChinaCloudArmTemplateParameters)
105105
# NodeTestVersion: "12.x"

eng/pipelines/templates/stages/archetype-js-release.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -161,8 +161,8 @@ stages:
161161
dependsOn: PublishPackage
162162

163163
pool:
164-
name: azsdk-pool-mms-win-2019-general
165-
vmImage: MMS2019
164+
name: azsdk-pool-mms-win-2022-general
165+
vmImage: MMS2022
166166

167167
strategy:
168168
runOnce:

eng/pipelines/templates/stages/platform-matrix.json

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,9 @@
44
},
55
"matrix": {
66
"Agent": {
7-
"windows-2019": {
8-
"OSVmImage": "MMS2019",
9-
"Pool": "azsdk-pool-mms-win-2019-general"
7+
"windows-2022": {
8+
"OSVmImage": "MMS2022",
9+
"Pool": "azsdk-pool-mms-win-2022-general"
1010
},
1111
"ubuntu-20.04": {
1212
"OSVmImage": "MMSUbuntu20.04",
@@ -28,9 +28,9 @@
2828
"include": [
2929
{
3030
"Agent": {
31-
"windows-2019": {
32-
"OSVmImage": "MMS2019",
33-
"Pool": "azsdk-pool-mms-win-2019-general"
31+
"windows-2022": {
32+
"OSVmImage": "MMS2022",
33+
"Pool": "azsdk-pool-mms-win-2022-general"
3434
}
3535
},
3636
"Scenario": {

eng/pipelines/templates/steps/use-node-test-version.yml

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,14 @@ steps:
66
parameters:
77
NodeVersion: $(NodeTestVersion)
88

9+
# Node 14.x uses package node-gyp@5.1.0 which is not compatible with win2022.
10+
# Following the readme to upgrade to the latest one. Readme: https://github.com/nodejs/node-gyp/blob/main/docs/Force-npm-to-use-global-node-gyp.md
11+
- pwsh: |
12+
npm install --global node-gyp@latest
13+
npm prefix -g | % {npm config set node_gyp "$_\node_modules\node-gyp\bin\node-gyp.js"}
14+
displayName: Upgrade node-gyp version in Node 14x
15+
condition: and(eq(variables['Pool'], 'azsdk-pool-mms-win-2022-general'), eq(variables['NodeTestVersion'], '14.x'))
16+
917
# Packages with native dependencies must be reinstalled after changing Node versions
1018
- pwsh: |
1119
$nativeDependencySymlinkPaths = "common/temp/node_modules/.pnpm/node_modules/keytar,common/temp/node_modules/.pnpm/node_modules/@azure/msal-node-extensions"

0 commit comments

Comments
 (0)