From c49375b9d4a289a1c37315f4b15d67530f065289 Mon Sep 17 00:00:00 2001 From: Daniel Jurek Date: Tue, 8 Apr 2025 10:08:05 -0700 Subject: [PATCH] Ubuntu 20 -> Ubuntu 22 migration (#6498) * Remove g++-8, not present in Ubuntu 22 * Update clang-11 job to Ubuntu 22 * Move live testing matrix to Ubuntu 22 * image.yml: Linux Next -> Linux * "release" differentiator * LINUXNEXT -> LINUX * Deduplicate Ubuntu 22 in live matrix * Trivial change to trigger CI * Revert "Trivial change to trigger CI" This reverts commit 72dae1d0cd90435cdad18391a993154a2b32c9e3. --- eng/pipelines/templates/jobs/ci.tests.yml | 4 +-- .../stages/platform-matrix-cmakegenerate.json | 4 +-- .../platform-matrix-cmakesourcegenerate.json | 4 +-- .../stages/platform-matrix-live.json | 21 +++------------ .../stages/platform-matrix-quick.json | 4 +-- .../templates/stages/platform-matrix.json | 27 ++++--------------- eng/pipelines/templates/variables/image.yml | 4 --- 7 files changed, 17 insertions(+), 51 deletions(-) diff --git a/eng/pipelines/templates/jobs/ci.tests.yml b/eng/pipelines/templates/jobs/ci.tests.yml index 8212ecd1b..1673e03bc 100644 --- a/eng/pipelines/templates/jobs/ci.tests.yml +++ b/eng/pipelines/templates/jobs/ci.tests.yml @@ -143,8 +143,8 @@ jobs: - bash: | # Run clang-format recursively on each source and header file within the repo sdk folder. echo "Check clang-formatting" - clang-format --version - find ./sdk \( -iname '*.hpp' -o -iname '*.cpp' \) ! -iname 'json.hpp' -exec clang-format -i {} \; + clang-format-11 --version + find ./sdk \( -iname '*.hpp' -o -iname '*.cpp' \) ! -iname 'json.hpp' -exec clang-format-11 -i {} \; if [[ `git status | grep modified | awk '{print $2}'` ]]; then echo Some files were not formatted correctly according to the .clang-format file. diff --git a/eng/pipelines/templates/stages/platform-matrix-cmakegenerate.json b/eng/pipelines/templates/stages/platform-matrix-cmakegenerate.json index d822c1137..db6a82415 100644 --- a/eng/pipelines/templates/stages/platform-matrix-cmakegenerate.json +++ b/eng/pipelines/templates/stages/platform-matrix-cmakegenerate.json @@ -3,8 +3,8 @@ "CmakeEnvArg": "", "OSConfig": { "Linux": { - "Pool": "env:LINUXNEXTPOOL", - "OSVmImage": "env:LINUXNEXTVMIMAGE", + "Pool": "env:LINUXPOOL", + "OSVmImage": "env:LINUXVMIMAGE", "AptDependencies": "libcurl4-openssl-dev", "VCPKG_DEFAULT_TRIPLET": "x64-linux" }, diff --git a/eng/pipelines/templates/stages/platform-matrix-cmakesourcegenerate.json b/eng/pipelines/templates/stages/platform-matrix-cmakesourcegenerate.json index 1ef1d36a8..d73487a8c 100644 --- a/eng/pipelines/templates/stages/platform-matrix-cmakesourcegenerate.json +++ b/eng/pipelines/templates/stages/platform-matrix-cmakesourcegenerate.json @@ -7,8 +7,8 @@ "CmakeEnvArg": "" }, "Linux": { - "Pool": "env:LINUXNEXTPOOL", - "OSVmImage": "env:LINUXNEXTVMIMAGE", + "Pool": "env:LINUXPOOL", + "OSVmImage": "env:LINUXVMIMAGE", "CmakeEnvArg": "", "AptDependencies": "libcurl4-openssl-dev" }, diff --git a/eng/pipelines/templates/stages/platform-matrix-live.json b/eng/pipelines/templates/stages/platform-matrix-live.json index 1c18468e7..8d3c5cac4 100644 --- a/eng/pipelines/templates/stages/platform-matrix-live.json +++ b/eng/pipelines/templates/stages/platform-matrix-live.json @@ -24,8 +24,8 @@ "Ubu2204": { "VCPKG_DEFAULT_TRIPLET": "x64-linux", "BuildArgs": "-j 4", - "Pool": "env:LINUXNEXTPOOL", - "OSVmImage": "env:LINUXNEXTVMIMAGE", + "Pool": "env:LINUXPOOL", + "OSVmImage": "env:LINUXVMIMAGE", "RunProxyTests": true } }, @@ -36,21 +36,8 @@ "CODE_COVERAGE": "enabled", "CODE_COVERAGE_COLLECT_ONLY": 1, "AZURE_CORE_ENABLE_JSON_TESTS": 1 - } - } - }, - { - "StaticConfigs": { - "Ubu20": { - "BuildArgs": "-j 4", - "Pool": "env:LINUXPOOL", - "OSVmImage": "env:LINUXVMIMAGE", - "VCPKG_DEFAULT_TRIPLET": "x64-linux", - "RunProxyTests": true - } - }, - "BuildConfig": { - "x64_with_unit_test": { + }, + "x64_with_unit_test_release": { "CmakeArgs": " -DBUILD_TESTING=ON -DBUILD_PERFORMANCE_TESTS=ON -DRUN_LONG_UNIT_TESTS=ON -DCMAKE_BUILD_TYPE=Release -DBUILD_SAMPLES=ON", "AZURE_CORE_ENABLE_JSON_TESTS": 1 }, diff --git a/eng/pipelines/templates/stages/platform-matrix-quick.json b/eng/pipelines/templates/stages/platform-matrix-quick.json index 7b1394a25..e0845a1d8 100644 --- a/eng/pipelines/templates/stages/platform-matrix-quick.json +++ b/eng/pipelines/templates/stages/platform-matrix-quick.json @@ -6,8 +6,8 @@ { "StaticConfigs": { "Ubuntu22": { - "OSVmImage": "env:LINUXNEXTVMIMAGE", - "Pool": "env:LINUXNEXTPOOL", + "OSVmImage": "env:LINUXVMIMAGE", + "Pool": "env:LINUXPOOL", "VCPKG_DEFAULT_TRIPLET": "x64-linux", "BuildArgs": "-j 10", "RunProxyTests": true diff --git a/eng/pipelines/templates/stages/platform-matrix.json b/eng/pipelines/templates/stages/platform-matrix.json index b4ae7eca0..b0326ea35 100644 --- a/eng/pipelines/templates/stages/platform-matrix.json +++ b/eng/pipelines/templates/stages/platform-matrix.json @@ -141,8 +141,8 @@ { "StaticConfigs": { "Ubuntu22": { - "OSVmImage": "env:LINUXNEXTVMIMAGE", - "Pool": "env:LINUXNEXTPOOL", + "OSVmImage": "env:LINUXVMIMAGE", + "Pool": "env:LINUXPOOL", "VCPKG_DEFAULT_TRIPLET": "x64-linux", "BuildArgs": "-j 10", "RunProxyTests": true @@ -189,25 +189,7 @@ }, { "StaticConfigs": { - "Ubuntu20": { - "OSVmImage": "env:LINUXVMIMAGE", - "Pool": "env:LINUXPOOL", - "VCPKG_DEFAULT_TRIPLET": "x64-linux", - "BuildArgs": "-j 10", - "RunProxyTests": true - } - }, - "BuildSettings": { - "gpp-8": { - "AptDependencies": "g++-8", - "CC": "/usr/bin/gcc-8", - "CXX": "/usr/bin/g++-8" - } - } - }, - { - "StaticConfigs": { - "Ubuntu20": { + "Ubuntu22": { "OSVmImage": "env:LINUXVMIMAGE", "Pool": "env:LINUXPOOL", "VCPKG_DEFAULT_TRIPLET": "x64-linux", @@ -216,7 +198,8 @@ "CXX": "/usr/bin/clang++-11", "CmakeArgs": " -DBUILD_TESTING=ON -DBUILD_PERFORMANCE_TESTS=ON -DRUN_LONG_UNIT_TESTS=ON", "PublishMapFiles": "true", - "RunProxyTests": true + "RunProxyTests": true, + "AptDependencies": "clang-11 clang-format-11" } }, "BuildSettings": { diff --git a/eng/pipelines/templates/variables/image.yml b/eng/pipelines/templates/variables/image.yml index 18da7ab0d..ed2532f59 100644 --- a/eng/pipelines/templates/variables/image.yml +++ b/eng/pipelines/templates/variables/image.yml @@ -2,8 +2,6 @@ variables: - name: LINUXPOOL - value: azsdk-pool-mms-ubuntu-2004-general - - name: LINUXNEXTPOOL value: azsdk-pool-mms-ubuntu-2204-general - name: WINDOWSPOOL value: azsdk-pool-mms-win-2022-general @@ -13,8 +11,6 @@ variables: value: Azure Pipelines - name: LINUXVMIMAGE - value: azsdk-pool-mms-ubuntu-2004-1espt - - name: LINUXNEXTVMIMAGE value: azsdk-pool-mms-ubuntu-2204-1espt - name: WINDOWSVMIMAGE value: azsdk-pool-mms-win-2022-1espt