Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

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

Merged
merged 9 commits into from
Feb 17, 2023
Merged

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

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
258f498
Update images MMS2019 and MMS2022 to their compliant equivalents
Feb 15, 2023
4e7b458
Update platform-matrix.json
Feb 15, 2023
c4d9522
Update perf.yml
Feb 15, 2023
0ad1c22
Update Get-BinarySizes.ps1
Feb 15, 2023
2b02cbd
update MMS2022 images to Compliant
Feb 15, 2023
b80157e
update to win-20xx format
Feb 17, 2023
0c7cf88
Update eng/common/pipelines/templates/jobs/perf.yml
Feb 17, 2023
f10cc48
Update eng/common/pipelines/templates/stages/archetype-sdk-tool-pwsh.yml
Feb 17, 2023
543babb
simplify Get-BinarySizes.ps1 / getTargetOs for windows
Feb 17, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion eng/pipelines/daily-verification.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ jobs:
displayName: Daily vcpkg PR
pool:
name: azsdk-pool-mms-win-2022-general
vmImage: MMS2022
vmImage: windows-2022

variables:
# The branch in the azure-sdk/vcpkg repo that is updated daily with the
Expand Down
4 changes: 2 additions & 2 deletions eng/pipelines/templates/jobs/archetype-sdk-client.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@ jobs:
displayName: Create API Review for ${{ artifact.name }}
pool:
name: azsdk-pool-mms-win-2022-general
vmImage: MMS2022
vmImage: windows-2022
steps:
- task: Powershell@2
inputs:
Expand Down Expand Up @@ -111,7 +111,7 @@ jobs:
- job: GenerateReleaseArtifacts
pool:
name: azsdk-pool-mms-win-2022-general
vmImage: MMS2022
vmImage: windows-2022
variables:
VCPKG_DEFAULT_TRIPLET: 'x64-windows-static'
Package.EnableSBOMSigning: true
Expand Down
10 changes: 5 additions & 5 deletions eng/pipelines/templates/stages/archetype-cpp-release.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ stages:

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

strategy:
runOnce:
Expand Down Expand Up @@ -63,7 +63,7 @@ stages:

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

strategy:
runOnce:
Expand Down Expand Up @@ -93,7 +93,7 @@ stages:
dependsOn: TagRepository
pool:
name: azsdk-pool-mms-win-2022-general
vmImage: MMS2022
vmImage: windows-2022

variables:
VcpkgPrRepoOwner: Microsoft
Expand Down Expand Up @@ -220,7 +220,7 @@ stages:

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

strategy:
runOnce:
Expand Down Expand Up @@ -248,7 +248,7 @@ stages:

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

steps:
- checkout: self
Expand Down
2 changes: 1 addition & 1 deletion eng/pipelines/templates/stages/platform-matrix-cmakegenerate.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
},
"Windows": {
"Pool": "azsdk-pool-mms-win-2022-general",
"OSVmImage": "MMS2022",
"OSVmImage": "windows-2022",
"VCPKG_DEFAULT_TRIPLET": "x64-windows"
},
"Mac": {
Expand Down
2 changes: 1 addition & 1 deletion eng/pipelines/templates/stages/platform-matrix-cmakesourcegenerate.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
"OSConfig": {
"Windows": {
"Pool": "azsdk-pool-mms-win-2022-general",
"OSVmImage": "MMS2022",
"OSVmImage": "windows-2022",
"CmakeEnvArg": ""
},
"Linux": {
Expand Down
4 changes: 2 additions & 2 deletions eng/pipelines/templates/stages/platform-matrix-live.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,12 +71,12 @@
"StaticConfigs": {
"Win2019": {
"Pool": "azsdk-pool-mms-win-2019-general",
"OSVmImage": "MMS2019",
"OSVmImage": "windows-2019",
"CMAKE_GENERATOR": "Visual Studio 16 2019"
},
"Win2022": {
"Pool": "azsdk-pool-mms-win-2022-general",
"OSVmImage": "MMS2022",
"OSVmImage": "windows-2022",
"CMAKE_GENERATOR": "Visual Studio 17 2022"
}
},
Expand Down
6 changes: 3 additions & 3 deletions eng/pipelines/templates/stages/platform-matrix.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@
{
"StaticConfigs": {
"Win2019_x64_Release": {
"OSVmImage": "MMS2019",
"OSVmImage": "windows-2019",
"Pool": "azsdk-pool-mms-win-2019-general",
"CMAKE_GENERATOR": "Visual Studio 16 2019",
"CMAKE_GENERATOR_PLATFORM": "x64",
Expand All @@ -49,7 +49,7 @@
{
"StaticConfigs": {
"Win2022": {
"OSVmImage": "MMS2022",
"OSVmImage": "windows-2022",
"Pool": "azsdk-pool-mms-win-2022-general",
"CMAKE_GENERATOR": "Visual Studio 17 2022"
}
Expand Down Expand Up @@ -106,7 +106,7 @@
"StaticConfigs": {
"Win2022": {
"VcpkgInstall": "openssl",
"OSVmImage": "MMS2022",
"OSVmImage": "windows-2022",
"Pool": "azsdk-pool-mms-win-2022-general",
"CMAKE_GENERATOR": "Visual Studio 17 2022",
"PublishMapFiles": "true"
Expand Down
4 changes: 2 additions & 2 deletions eng/scripts/Get-BinarySizes.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,11 +48,11 @@ function getTargetOs {
return $OsVMImage
}

if ($OsVMImage -match "^MMS2019$|^win-2019$") {
if ($OsVMImage -eq "windows-2019") {
return "win-2019"
}

if ($OsVMImage -match "^MMS2022$|^win-2022$|^windows-2022$") {
if ($OsVMImage -eq "windows-2022") {
return "win-2022"
}

Expand Down