github/azure-sdk-for-cpp
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Revert "Update Ubuntu VM Image from 18 to 20 (#2564)" (#2689)

Browse Source 
* Revert "Update Ubuntu VM Image from 18 to 20 (#2564)"

This reverts commit 59440caa39.

* Add Ubuntu 20 to matrix
This commit is contained in:
Daniel Jurek 2021-08-03 09:14:34 -07:00 committed by GitHub
parent 2feed76d86
commit d9b5d69723
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 26 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
eng/pipelines/templates/jobs/archetype-sdk-client.yml
View File

@ -27,24 +27,24 @@ jobs:
strategy:
matrix:
Linux_x64_gcc8:
Pool: azsdk-pool-mms-ubuntu-2004-general
OSVmImage: MMSUbuntu20.04
Pool: azsdk-pool-mms-ubuntu-1804-general
OSVmImage: MMSUbuntu18.04
VcpkgInstall: 'curl[ssl] libxml2 openssl'
VCPKG_DEFAULT_TRIPLET: 'x64-linux'
CC: '/usr/bin/gcc-8'
CXX: '/usr/bin/g++-8'
BuildArgs: '-j 10'
Linux_x64_gcc9:
Pool: azsdk-pool-mms-ubuntu-2004-general
OSVmImage: MMSUbuntu20.04
Pool: azsdk-pool-mms-ubuntu-1804-general
OSVmImage: MMSUbuntu18.04
VcpkgInstall: 'curl[ssl] libxml2 openssl'
VCPKG_DEFAULT_TRIPLET: 'x64-linux'
CC: '/usr/bin/gcc-9'
CXX: '/usr/bin/g++-9'
BuildArgs: '-j 10'
Linux_x64:
Pool: azsdk-pool-mms-ubuntu-2004-general
OSVmImage: MMSUbuntu20.04
Pool: azsdk-pool-mms-ubuntu-1804-general
OSVmImage: MMSUbuntu18.04
VcpkgInstall: 'curl[ssl] libxml2 openssl'
VCPKG_DEFAULT_TRIPLET: 'x64-linux'
BuildArgs: '-j 10'
@ -75,8 +75,8 @@ jobs:
# Unit testing ON
Linux_x64_with_unit_test:
Pool: azsdk-pool-mms-ubuntu-2004-general
OSVmImage: MMSUbuntu20.04
Pool: azsdk-pool-mms-ubuntu-1804-general
OSVmImage: MMSUbuntu18.04
VcpkgInstall: 'curl[ssl] libxml2 openssl'
VCPKG_DEFAULT_TRIPLET: 'x64-linux'
CmakeArgs: ' -DBUILD_TESTING=ON -DBUILD_PERFORMANCE_TESTS=ON -DRUN_LONG_UNIT_TESTS=ON -DCMAKE_BUILD_TYPE=Debug -DBUILD_CODE_COVERAGE=ON'
@ -86,12 +86,19 @@ jobs:
CODE_COVERAGE_COLLECT_ONLY: 1
BuildArgs: '-j 10'
Linux_x64_with_unit_test_release:
Pool: azsdk-pool-mms-ubuntu-1804-general
OSVmImage: MMSUbuntu18.04
VcpkgInstall: 'curl[ssl] libxml2 openssl'
VCPKG_DEFAULT_TRIPLET: 'x64-linux'
CmakeArgs: ' -DCMAKE_BUILD_TYPE=Release -DBUILD_TESTING=ON -DBUILD_PERFORMANCE_TESTS=ON -DRUN_LONG_UNIT_TESTS=ON'
BuildArgs: '-j 10'
Ubuntu20_x64_with_unit_test_release:
Pool: azsdk-pool-mms-ubuntu-2004-general
OSVmImage: MMSUbuntu20.04
VcpkgInstall: 'curl[ssl] libxml2 openssl'
VCPKG_DEFAULT_TRIPLET: 'x64-linux'
CmakeArgs: ' -DCMAKE_BUILD_TYPE=Release -DBUILD_TESTING=ON -DBUILD_PERFORMANCE_TESTS=ON -DRUN_LONG_UNIT_TESTS=ON'
BuildArgs: '-j 10'
BuildArgs: '-j 10'
Win_x86_with_unit_test:
Pool: azsdk-pool-mms-win-2019-general
OSVmImage: MMS2019

12
eng/pipelines/templates/jobs/archetype-sdk-tests.yml
View File

@ -28,8 +28,8 @@ jobs:
strategy:
matrix:
Linux_x64_with_unit_test:
Pool: azsdk-pool-mms-ubuntu-2004-general
OSVmImage: MMSUbuntu20.04
Pool: azsdk-pool-mms-ubuntu-1804-general
OSVmImage: MMSUbuntu18.04
VcpkgInstall: 'curl[ssl] libxml2 openssl'
VCPKG_DEFAULT_TRIPLET: 'x64-linux'
CmakeArgs: ' -DBUILD_TESTING=ON -DBUILD_PERFORMANCE_TESTS=ON -DRUN_LONG_UNIT_TESTS=ON -DCMAKE_BUILD_TYPE=Debug -DBUILD_CODE_COVERAGE=ON'
@ -39,6 +39,14 @@ jobs:
CODE_COVERAGE_COLLECT_ONLY: 1
AZURE_CORE_ENABLE_JSON_TESTS: 1
BuildArgs: '-j 4'
Ubuntu20_x64_with_unit_test:
Pool: azsdk-pool-mms-ubuntu-1804-general
OSVmImage: MMSUbuntu18.04
VcpkgInstall: 'curl[ssl] libxml2 openssl'
VCPKG_DEFAULT_TRIPLET: 'x64-linux'
CmakeArgs: ' -DBUILD_TESTING=ON -DBUILD_PERFORMANCE_TESTS=ON -DRUN_LONG_UNIT_TESTS=ON -DCMAKE_BUILD_TYPE=Release'
AZURE_CORE_ENABLE_JSON_TESTS: 1
BuildArgs: '-j 4'
# Not asking for any transport adapter will default to OS -> windows:winHttp or !windows:libcurl
Win_x86_with_unit_test_winHttp:
Pool: azsdk-pool-mms-win-2019-general