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 #2504

Merged
merged 5 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 #2504

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
7509906
update pools to compliant
Feb 15, 2023
38d4cf1
revert change in eng/common
Feb 17, 2023
132f589
Migrate Windows pools and images to compliant 2022
Feb 17, 2023
8ebb31f
revert back to 2019 in one place
Feb 17, 2023
6b85077
revert another migration
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/common/pipelines/templates/jobs/perf.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ parameters:
default: 'azsdk-pool-mms-win-2019-perf'
- name: WindowsVmImage
type: string
default: 'MMS2019'
default: 'MMS2019Compliant'
konrad-jamrozik marked this conversation as resolved.
Show resolved Hide resolved
- name: Language
type: string
default: ''
Expand Down
2 changes: 1 addition & 1 deletion eng/common/pipelines/templates/stages/archetype-sdk-tool-pwsh.yml
View file
Open in desktop
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: 'MMS2022Compliant'
Linux:
Pool: azsdk-pool-mms-ubuntu-2204-general
Image: MMSUbuntu22.04
Expand Down
12 changes: 6 additions & 6 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 @@ -85,7 +85,7 @@ jobs:

Windows_VS2022_X86_Release_MapFiles_UnitTests:
Pool: azsdk-pool-mms-win-2022-general
OSVmImage: MMS2022
OSVmImage: MMS2022Compliant
vcpkg.deps: 'cmocka'
VCPKG_DEFAULT_TRIPLET: 'x86-windows-static'
build.args: '-DPRECONDITIONS=OFF -DUNIT_TESTING=ON -DLOGGING=OFF -DADDRESS_SANITIZER=ON'
Expand Down Expand Up @@ -183,7 +183,7 @@ jobs:

Windows2019_Preconditions_UnitTests_Samples:
Pool: azsdk-pool-mms-win-2019-general
OSVmImage: MMS2019
OSVmImage: MMS2019Compliant
vcpkg.deps: 'curl[winssl] paho-mqtt cmocka'
VCPKG_DEFAULT_TRIPLET: 'x64-windows-static'
build.args: '-DTRANSPORT_CURL=ON -DTRANSPORT_PAHO=ON -DAZ_PLATFORM_IMPL=WIN32 -DUNIT_TESTING=ON -DLOGGING=OFF -DADDRESS_SANITIZER=ON'
Expand All @@ -194,15 +194,15 @@ jobs:

Windows2022_Preconditions_UnitTests_Samples:
Pool: azsdk-pool-mms-win-2022-general
OSVmImage: MMS2022
OSVmImage: MMS2022Compliant
vcpkg.deps: 'curl[winssl] paho-mqtt cmocka'
VCPKG_DEFAULT_TRIPLET: 'x64-windows-static'
build.args: '-DTRANSPORT_CURL=ON -DTRANSPORT_PAHO=ON -DAZ_PLATFORM_IMPL=WIN32 -DUNIT_TESTING=ON -DLOGGING=OFF -DADDRESS_SANITIZER=ON'
CMAKE_GENERATOR: 'Visual Studio 17 2022'
CMAKE_GENERATOR_PLATFORM: x64
PublishMapFiles: 'false'
BuildType: Debug

MacOS_Release_Preconditions_Logging_UnitTests_Samples:
Pool: Azure Pipelines
OSVmImage: 'macos-11'
Expand Down Expand Up @@ -247,7 +247,7 @@ jobs:

Windows_Release_Samples_MapFiles:
Pool: azsdk-pool-mms-win-2022-general
OSVmImage: MMS2022
OSVmImage: MMS2022Compliant
vcpkg.deps: 'paho-mqtt'
VCPKG_DEFAULT_TRIPLET: 'x64-windows-static'
build.args: '-DPRECONDITIONS=OFF -DLOGGING=OFF -DTRANSPORT_PAHO=ON'
Expand Down Expand Up @@ -454,7 +454,7 @@ jobs:
- job: GenerateReleaseArtifacts
pool:
name: azsdk-pool-mms-win-2022-general
vmImage: MMS2022
vmImage: MMS2022Compliant
variables:
Package.EnableSBOMSigning: true
steps:
Expand Down
8 changes: 4 additions & 4 deletions eng/pipelines/templates/jobs/archetype-sdk-tests.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ jobs:
# Test on the win 2019
Win2019_x64_with_iot_samples:
Pool: azsdk-pool-mms-win-2019-general
OSVmImage: MMS2019
OSVmImage: MMS2019Compliant
VCPKG_DEFAULT_TRIPLET: 'x64-windows-static'
CMAKE_GENERATOR: 'Visual Studio 16 2019'
CMAKE_GENERATOR_PLATFORM: x64
Expand All @@ -34,7 +34,7 @@ jobs:
# Test on the win 2022
Win2022_x64_with_iot_samples:
Pool: azsdk-pool-mms-win-2022-general
OSVmImage: MMS2022
OSVmImage: MMS2022Compliant
VCPKG_DEFAULT_TRIPLET: 'x64-windows-static'
CMAKE_GENERATOR: 'Visual Studio 17 2022'
CMAKE_GENERATOR_PLATFORM: x64
Expand All @@ -57,14 +57,14 @@ jobs:
# build.args: ' -DTRANSPO.RT_CURL=ON -DAZ_PLATFORM_IMPL=POSIX'
# Win_x86_with_sampldes:
# Pool: azsdk-pool-mms-win-2022-general
# OSVmImage: MMS2022
# OSVmImage: MMS2022Compliant
# VCPKG_DEFAULT_TRIPLET: 'x86-windows-static'
# CMAKE_GENERATOR: 'Visual Studio 17 2022'
# CMAKE_GENERATOR_PLATFORM: Win32
# build.args: ' -DTRANSPORT_CURL=ON -DAZ_PLATFORM_IMPL=WIN32'
# Win_x64_with_samples:
# Pool: azsdk-pool-mms-win-2022-general
# OSVmImage: MMS2022
# OSVmImage: MMS2022Compliant
# VCPKG_DEFAULT_TRIPLET: 'x64-windows-static'
# CMAKE_GENERATOR: 'Visual Studio 17 2022'
# CMAKE_GENERATOR_PLATFORM: x64
Expand Down
8 changes: 4 additions & 4 deletions eng/pipelines/templates/stages/archetype-c-release.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ stages:

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

strategy:
runOnce:
Expand All @@ -37,15 +37,15 @@ stages:
RepoId: $(Build.Repository.Name)
WorkingDirectory: $(Build.SourcesDirectory)
ScriptDirectory: $(Build.SourcesDirectory)/eng/common/scripts/

- deployment: PublishDocs
displayName: Publish Docs to GitHub pages
condition: ne(variables['Skip.PublishDocs'], 'true')
environment: githubio

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

strategy:
runOnce:
Expand All @@ -71,7 +71,7 @@ stages:

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

strategy:
runOnce:
Expand Down