Migrate to azsdk-pool, Move off Windows 2019 (#6609)
This commit is contained in:
parent
8573c29cde
commit
ef5c3cfc45
@ -3,12 +3,17 @@ jobs:
|
||||
- job:
|
||||
displayName: Daily vcpkg PR
|
||||
pool:
|
||||
name: azsdk-pool-mms-win-2022-general
|
||||
name: $(WINDOWSPOOL)
|
||||
demands: $(WindowsImageDemand)
|
||||
|
||||
variables:
|
||||
# The branch in the azure-sdk/vcpkg repo that is updated daily with the
|
||||
# latest set of ports
|
||||
TargetPrBranch: release/azure-sdk-for-cpp-daily-verification
|
||||
- name: TargetPrBranch
|
||||
value: release/azure-sdk-for-cpp-daily-verification
|
||||
|
||||
- template: /eng/pipelines/templates/variables/image.yml
|
||||
|
||||
|
||||
steps:
|
||||
- checkout: self
|
||||
|
||||
@ -25,8 +25,8 @@ stages:
|
||||
environment: package-publish
|
||||
|
||||
pool:
|
||||
name: azsdk-pool-mms-win-2022-general
|
||||
image: azsdk-pool-mms-win-2022-1espt
|
||||
name: azsdk-pool
|
||||
image: windows-2022
|
||||
os: windows
|
||||
|
||||
templateContext:
|
||||
|
||||
@ -97,8 +97,8 @@ extends:
|
||||
isMainPipeline: true
|
||||
enableForGitHub: true
|
||||
sourceAnalysisPool:
|
||||
name: azsdk-pool-mms-win-2022-general
|
||||
image: azsdk-pool-mms-win-2022-1espt
|
||||
name: azsdk-pool
|
||||
image: windows-2022
|
||||
os: windows
|
||||
# Turn off the build warnings caused by disabling some sdl checks
|
||||
createAdoIssuesForJustificationsForDisablement: false
|
||||
|
||||
@ -52,11 +52,6 @@
|
||||
},
|
||||
{
|
||||
"StaticConfigs": {
|
||||
"Win2019": {
|
||||
"Pool": "env:WINDOWSPREVIOUSPOOL",
|
||||
"OSVmImage": "env:WINDOWSPREVIOUSVMIMAGE",
|
||||
"CMAKE_GENERATOR": "Visual Studio 16 2019"
|
||||
},
|
||||
"Win2022": {
|
||||
"Pool": "env:WINDOWSPOOL",
|
||||
"OSVmImage": "env:WINDOWSVMIMAGE",
|
||||
|
||||
@ -30,10 +30,9 @@
|
||||
},
|
||||
{
|
||||
"StaticConfigs": {
|
||||
"Win2019_x64_Release": {
|
||||
"OSVmImage": "env:WINDOWSPREVIOUSVMIMAGE",
|
||||
"Pool": "azsdk-pool-mms-win-2019-1es-pt",
|
||||
"CMAKE_GENERATOR": "Visual Studio 16 2019",
|
||||
"Win2022_x64_Release": {
|
||||
"OSVmImage": "env:WINDOWSVMIMAGE",
|
||||
"Pool": "env:WINDOWSPOOL",
|
||||
"CMAKE_GENERATOR_PLATFORM": "x64",
|
||||
"VCPKG_DEFAULT_TRIPLET": "x64-windows-static",
|
||||
"BuildArgs": "--parallel 8 --config Release"
|
||||
|
||||
@ -2,20 +2,16 @@
|
||||
|
||||
variables:
|
||||
- name: LINUXPOOL
|
||||
value: azsdk-pool-mms-ubuntu-2204-general
|
||||
value: azsdk-pool
|
||||
- name: WINDOWSPOOL
|
||||
value: azsdk-pool-mms-win-2022-general
|
||||
- name: WINDOWSPREVIOUSPOOL
|
||||
value: azsdk-pool-mms-win-2019-general
|
||||
value: azsdk-pool
|
||||
- name: MACPOOL
|
||||
value: Azure Pipelines
|
||||
|
||||
- name: LINUXVMIMAGE
|
||||
value: azsdk-pool-mms-ubuntu-2204-1espt
|
||||
value: ubuntu-22.04
|
||||
- name: WINDOWSVMIMAGE
|
||||
value: azsdk-pool-mms-win-2022-1espt
|
||||
- name: WINDOWSPREVIOUSVMIMAGE
|
||||
value: azsdk-pool-mms-win-2019-1espt
|
||||
value: windows-2022
|
||||
- name: MACVMIMAGE
|
||||
value: macos-latest
|
||||
|
||||
@ -27,3 +23,7 @@ variables:
|
||||
- name: MACOS
|
||||
value: macOS
|
||||
|
||||
- name: LinuxImageDemand
|
||||
value: ImageOverride -equals $(LINUXVMIMAGE)
|
||||
- name: WindowsImageDemand
|
||||
value: ImageOverride -equals $(WINDOWSVMIMAGE)
|
||||
Loading…
Reference in New Issue
Block a user