Initial cut over to 1ES hosted pools. (#1321)

This commit is contained in:
Mitch Denny 2021-01-13 10:14:59 +11:00 committed by GitHub
parent f8aebf5634
commit ab6ec8ef0b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 69 additions and 24 deletions

View File

@ -1,10 +1,28 @@
parameters:
Artifacts: []
ServiceDirectory: not-specified
Coverage: ''
CtestRegex: .*
BuildReleaseArtifacts: true
CoverageReportPath: 'sdk/*/*/*cov_xml.xml'
- name: Artifacts
type: object
default: []
- name: ServiceDirectory
type: string
default: not-specified
- name: Coverage
type: string
default: ''
- name: CtestRegex
type: string
default: .*
- name: BuildReleaseArtifacts
type: boolean
default: true
- name: CoverageReportPath
type: string
default: 'sdk/*/*/*cov_xml.xml'
- name: WindowsPool
type: string
default: azsdk-pool-mms-win-2019-general
- name: LinuxPool
type: string
default: azsdk-pool-mms-ubuntu-1804-general
jobs:
- job: Validate
@ -12,26 +30,30 @@ jobs:
strategy:
matrix:
Linux_x64_gcc8:
OSVmImage: 'ubuntu-18.04'
Pool: $(LinuxPool)
OSVmImage:
VcpkgInstall: 'curl[ssl] libxml2 openssl nlohmann-json'
VCPKG_DEFAULT_TRIPLET: 'x64-linux'
CC: '/usr/bin/gcc-8'
CXX: '/usr/bin/g++-8'
BuildArgs: '-j 10'
Linux_x64_gcc9:
OSVmImage: 'ubuntu-18.04'
Pool: $(LinuxPool)
OSVmImage:
VcpkgInstall: 'curl[ssl] libxml2 openssl nlohmann-json'
VCPKG_DEFAULT_TRIPLET: 'x64-linux'
CC: '/usr/bin/gcc-9'
CXX: '/usr/bin/g++-9'
BuildArgs: '-j 10'
Linux_x64:
OSVmImage: 'ubuntu-18.04'
Pool: $(LinuxPool)
OSVmImage:
VcpkgInstall: 'curl[ssl] libxml2 openssl nlohmann-json'
VCPKG_DEFAULT_TRIPLET: 'x64-linux'
BuildArgs: '-j 10'
Win_x86:
OSVmImage: 'windows-2019'
Pool: $(WindowsPool)
OSVmImage:
VcpkgInstall: 'curl[winssl] libxml2 nlohmann-json'
VCPKG_DEFAULT_TRIPLET: 'x86-windows-static'
CMAKE_GENERATOR: 'Visual Studio 16 2019'
@ -39,20 +61,23 @@ jobs:
CmakeArgs: ' -DBUILD_TRANSPORT_CURL=ON' #Leaving curl on here to explicitly test what the default behavior is on windows.
BuildArgs: '-v --parallel 8'
Win_x64:
OSVmImage: 'windows-2019'
Pool: $(WindowsPool)
OSVmImage:
VcpkgInstall: 'curl[winssl] libxml2 nlohmann-json'
VCPKG_DEFAULT_TRIPLET: 'x64-windows-static'
CMAKE_GENERATOR: 'Visual Studio 16 2019'
CMAKE_GENERATOR_PLATFORM: x64
BuildArgs: '-v --parallel 8'
MacOS_x64:
OSVmImage: 'macOS-10.14'
VcpkgInstall: 'curl[ssl] libxml2 openssl nlohmann-json'
VCPKG_DEFAULT_TRIPLET: 'x64-osx'
Pool:
OSVmImage: 'macOS-10.14'
VcpkgInstall: 'curl[ssl] libxml2 openssl nlohmann-json'
VCPKG_DEFAULT_TRIPLET: 'x64-osx'
# Unit testing ON
Linux_x64_with_unit_test:
OSVmImage: 'ubuntu-18.04'
Pool: $(LinuxPool)
OSVmImage:
VcpkgInstall: 'curl[ssl] libxml2 openssl nlohmann-json'
VCPKG_DEFAULT_TRIPLET: 'x64-linux'
CmakeArgs: ' -DBUILD_TESTING=ON -DRUN_LONG_UNIT_TESTS=ON -DCMAKE_BUILD_TYPE=Debug -DBUILD_CODE_COVERAGE=ON'
@ -62,7 +87,8 @@ jobs:
CODE_COVERAGE_COLLECT_ONLY: 1
BuildArgs: '-j 10'
Win_x86_with_unit_test:
OSVmImage: 'windows-2019'
Pool: $(WindowsPool)
OSVmImage:
VcpkgInstall: 'curl[winssl] libxml2 nlohmann-json'
VCPKG_DEFAULT_TRIPLET: 'x86-windows-static'
CMAKE_GENERATOR: 'Visual Studio 16 2019'
@ -70,7 +96,8 @@ jobs:
CmakeArgs: ' -DBUILD_TESTING=ON -DRUN_LONG_UNIT_TESTS=ON -DBUILD_TRANSPORT_CURL=ON -DBUILD_TRANSPORT_WINHTTP=ON'
BuildArgs: '-v --parallel 8'
Win_x64_with_unit_test:
OSVmImage: 'windows-2019'
Pool: $(WindowsPool)
OSVmImage:
VcpkgInstall: 'curl[winssl] libxml2 nlohmann-json'
VCPKG_DEFAULT_TRIPLET: 'x64-windows-static'
CMAKE_GENERATOR: 'Visual Studio 16 2019'
@ -78,17 +105,28 @@ jobs:
CmakeArgs: ' -DBUILD_TESTING=ON -DRUN_LONG_UNIT_TESTS=ON -DBUILD_TRANSPORT_CURL=ON -DBUILD_TRANSPORT_WINHTTP=ON'
BuildArgs: '-v --parallel 8'
MacOS_x64_with_unit_test:
Pool:
OSVmImage: 'macOS-10.14'
VcpkgInstall: 'curl[ssl] libxml2 openssl nlohmann-json'
VCPKG_DEFAULT_TRIPLET: 'x64-osx'
CmakeArgs: ' -DBUILD_TESTING=ON -DRUN_LONG_UNIT_TESTS=ON -DBUILD_TRANSPORT_CURL=ON'
pool:
vmImage: $(OSVmImage)
name: $[coalesce(variables['Pool'], '')]
vmImage: $[coalesce(variables['OSVmImage'], '')]
variables:
CMOCKA_XML_FILE: "%g-test-results.xml"
CMOCKA_MESSAGE_OUTPUT: "xml"
BuildArgs: ""
AZURE_ENABLE_STATIC_ANALYSIS: 1
- name: CMOCKA_XML_FILE
value: "%g-test-results.xml"
- name: CMOCKA_MESSAGE_OUTPUT
value: "xml"
- name: BuildArgs
value: ""
- name: AZURE_ENABLE_STATIC_ANALYSIS
value: 1
- name: WindowsPool
value: ${{parameters.WindowsPool}}
- name: LinuxPool
value: ${{parameters.LinuxPool}}
steps:
- checkout: self
@ -140,9 +178,8 @@ jobs:
- ${{ if ne(parameters.ServiceDirectory, 'not-specified' )}}:
- job: GenerateReleaseArtifacts
pool:
vmImage: $(OSVmImage)
name: ${{ parameters.WindowsPool }}
variables:
OSVmImage: windows-2019
VcpkgDependencies: curl[winssl] libxml2 nlohmann-json
VCPKG_DEFAULT_TRIPLET: 'x64-windows-static'
steps:

View File

@ -23,6 +23,12 @@ parameters:
- name: CoverageReportPath
type: string
default: 'sdk/*/*/*cov_xml.xml'
- name: WindowsPool
type: string
default: azsdk-pool-mms-win-2019-general
- name: LinuxPool
type: string
default: azsdk-pool-mms-ubuntu-1804-general
stages:
- stage: Build
@ -34,6 +40,8 @@ stages:
CtestRegex: ${{ parameters.CtestRegex }}
Coverage: ${{ parameters.Coverage }}
CoverageReportPath: ${{ parameters.CoverageReportPath }}
WindowsPool: ${{ parameters.WindowsPool }}
LinuxPool: ${{ parameters.LinuxPool }}
- ${{ if and(eq(variables['System.TeamProject'], 'internal'), ne(parameters.LiveTestCtestRegex, '')) }}:
- stage: LiveTest