From 9756e970b4ab64a14a4432a8da4c44b80ca822d6 Mon Sep 17 00:00:00 2001 From: Scott Beddall <45376673+scbedd@users.noreply.github.com> Date: Fri, 20 Oct 2023 17:08:44 -0700 Subject: [PATCH] Rebalance Build Matrix (#32590) * massage the matrix a bit to see if we can get windows not on 311 * remove platform-matrix-cryptography-dependency in most cases * resolve replace pypy39 with py39 in storage build matrix to ensure that everything actually runs to completion. --- ...atform-matrix-cryptography-dependency.json | 62 ------------------- ...on => platform-matrix-excluding-pypy.json} | 15 +---- .../templates/stages/platform-matrix.json | 4 +- sdk/attestation/ci.yml | 2 +- sdk/eventhub/ci.yml | 2 +- sdk/identity/platform-matrix.json | 2 +- sdk/keyvault/ci.yml | 2 +- sdk/metricsadvisor/ci.yml | 5 -- sdk/schemaregistry/ci.yml | 5 -- sdk/storage/ci.yml | 2 +- 10 files changed, 9 insertions(+), 92 deletions(-) delete mode 100644 eng/pipelines/templates/stages/platform-matrix-cryptography-dependency.json rename eng/pipelines/templates/stages/{platform-matrix-metricsadvisor_tables.json => platform-matrix-excluding-pypy.json} (75%) diff --git a/eng/pipelines/templates/stages/platform-matrix-cryptography-dependency.json b/eng/pipelines/templates/stages/platform-matrix-cryptography-dependency.json deleted file mode 100644 index 216812a4f084..000000000000 --- a/eng/pipelines/templates/stages/platform-matrix-cryptography-dependency.json +++ /dev/null @@ -1,62 +0,0 @@ -{ - "displayNames": { - "--disablecov": "" - }, - "matrix": { - "Agent": { - "ubuntu-20.04": { "OSVmImage": "MMSUbuntu20.04", "Pool": "azsdk-pool-mms-ubuntu-2004-general" }, - "macos-11": { "OSVmImage": "macos-11", "Pool": "Azure Pipelines" } - }, - "PythonVersion": [ "3.8" ], - "CoverageArg": "--disablecov" - }, - "include": [ - { - "Config": { - "Ubuntu2004_312": { - "OSVmImage": "MMSUbuntu20.04", - "Pool": "azsdk-pool-mms-ubuntu-2004-general", - "PythonVersion": "3.12.0", - "CoverageArg": "--disablecov", - "TestSamples": "false" - } - } - }, - { - "Config": { - "Ubuntu2004_311": { - "OSVmImage": "MMSUbuntu20.04", - "Pool": "azsdk-pool-mms-ubuntu-2004-general", - "PythonVersion": "3.11", - "CoverageArg": "--disablecov", - "TestSamples": "false" - } - } - }, - { - "Agent": { - "macos-11": { "OSVmImage": "macos-11", "Pool": "Azure Pipelines" } - }, - "PythonVersion": "3.7", - "CoverageArg": "--disablecov" - }, - { - "CoverageConfig": { - "ubuntu2004_310_coverage": { - "OSVmImage": "MMSUbuntu20.04", - "Pool": "azsdk-pool-mms-ubuntu-2004-general", - "PythonVersion": "3.10", - "CoverageArg": "", - "TestSamples": "false" - } - } - }, - { - "Agent": { - "windows-2022": { "OSVmImage": "MMS2022", "Pool": "azsdk-pool-mms-win-2022-general" } - }, - "PythonVersion": "3.9", - "CoverageArg": "--disablecov" - } - ] -} diff --git a/eng/pipelines/templates/stages/platform-matrix-metricsadvisor_tables.json b/eng/pipelines/templates/stages/platform-matrix-excluding-pypy.json similarity index 75% rename from eng/pipelines/templates/stages/platform-matrix-metricsadvisor_tables.json rename to eng/pipelines/templates/stages/platform-matrix-excluding-pypy.json index 478d7c95f1a9..9bf0daac902a 100644 --- a/eng/pipelines/templates/stages/platform-matrix-metricsadvisor_tables.json +++ b/eng/pipelines/templates/stages/platform-matrix-excluding-pypy.json @@ -6,11 +6,11 @@ }, "matrix": { "Agent": { - "ubuntu-20.04": { "OSVmImage": "MMSUbuntu20.04", "Pool": "azsdk-pool-mms-ubuntu-2004-general" }, "windows-2022": { "OSVmImage": "MMS2022", "Pool": "azsdk-pool-mms-win-2022-general" }, + "ubuntu-20.04": { "OSVmImage": "MMSUbuntu20.04", "Pool": "azsdk-pool-mms-ubuntu-2004-general" }, "macos-11": { "OSVmImage": "macos-11", "Pool": "Azure Pipelines" } }, - "PythonVersion": [ "pypy3.9", "3.7", "3.8", "3.10" ], + "PythonVersion": [ "3.9", "3.7", "3.8", "3.10", "3.11" ], "CoverageArg": "--disablecov", "TestSamples": "false" }, @@ -26,17 +26,6 @@ } } }, - { - "Config": { - "Ubuntu2004_311": { - "OSVmImage": "MMSUbuntu20.04", - "Pool": "azsdk-pool-mms-ubuntu-2004-general", - "PythonVersion": "3.11", - "CoverageArg": "--disablecov", - "TestSamples": "false" - } - } - }, { "Config": { "Ubuntu2004_3120": { diff --git a/eng/pipelines/templates/stages/platform-matrix.json b/eng/pipelines/templates/stages/platform-matrix.json index 1fb5973300c8..f72defbd4af0 100644 --- a/eng/pipelines/templates/stages/platform-matrix.json +++ b/eng/pipelines/templates/stages/platform-matrix.json @@ -6,11 +6,11 @@ }, "matrix": { "Agent": { - "ubuntu-20.04": { "OSVmImage": "MMSUbuntu20.04", "Pool": "azsdk-pool-mms-ubuntu-2004-general" }, "windows-2022": { "OSVmImage": "MMS2022", "Pool": "azsdk-pool-mms-win-2022-general" }, + "ubuntu-20.04": { "OSVmImage": "MMSUbuntu20.04", "Pool": "azsdk-pool-mms-ubuntu-2004-general" }, "macos-11": { "OSVmImage": "macos-11", "Pool": "Azure Pipelines" } }, - "PythonVersion": [ "pypy3.9", "3.7", "3.8", "3.10", "3.11" ], + "PythonVersion": [ "3.7", "pypy3.9", "3.8", "3.10", "3.11" ], "CoverageArg": "--disablecov", "TestSamples": "false" }, diff --git a/sdk/attestation/ci.yml b/sdk/attestation/ci.yml index b142a73a7877..9eb456cc2268 100644 --- a/sdk/attestation/ci.yml +++ b/sdk/attestation/ci.yml @@ -31,7 +31,7 @@ extends: # Override the base matrix due to https://github.com/Azure/azure-sdk-for-python/issues/17837 MatrixConfigs: - Name: attestation_ci_matrix - Path: eng/pipelines/templates/stages/platform-matrix-cryptography-dependency.json + Path: eng/pipelines/templates/stages/platform-matrix.json Selection: sparse GenerateVMJobs: true Artifacts: diff --git a/sdk/eventhub/ci.yml b/sdk/eventhub/ci.yml index 38667b391255..5e6cf329722c 100644 --- a/sdk/eventhub/ci.yml +++ b/sdk/eventhub/ci.yml @@ -32,7 +32,7 @@ extends: # Override the base matrix due to https://github.com/Azure/azure-sdk-for-python/issues/17837 MatrixConfigs: - Name: eventhub_ci_matrix - Path: eng/pipelines/templates/stages/platform-matrix-cryptography-dependency.json + Path: eng/pipelines/templates/stages/platform-matrix.json Selection: sparse GenerateVMJobs: true MatrixFilters: diff --git a/sdk/identity/platform-matrix.json b/sdk/identity/platform-matrix.json index 00a11b163082..d0f5fda7a477 100644 --- a/sdk/identity/platform-matrix.json +++ b/sdk/identity/platform-matrix.json @@ -1,6 +1,6 @@ { "matrix": { - "$IMPORT": "eng/pipelines/templates/stages/platform-matrix-cryptography-dependency.json" + "$IMPORT": "eng/pipelines/templates/stages/platform-matrix.json" }, "exclude": [ { "PythonVersion": "3.7" } diff --git a/sdk/keyvault/ci.yml b/sdk/keyvault/ci.yml index 4c5332ad186c..7417cb7337ee 100644 --- a/sdk/keyvault/ci.yml +++ b/sdk/keyvault/ci.yml @@ -34,7 +34,7 @@ extends: # Override the base matrix due to https://github.com/Azure/azure-sdk-for-python/issues/17837 MatrixConfigs: - Name: keyvault_ci_matrix - Path: eng/pipelines/templates/stages/platform-matrix-cryptography-dependency.json + Path: eng/pipelines/templates/stages/platform-matrix.json Selection: sparse GenerateVMJobs: true Artifacts: diff --git a/sdk/metricsadvisor/ci.yml b/sdk/metricsadvisor/ci.yml index fab0d3e8a2f8..500ce42467cc 100644 --- a/sdk/metricsadvisor/ci.yml +++ b/sdk/metricsadvisor/ci.yml @@ -31,11 +31,6 @@ extends: parameters: ServiceDirectory: metricsadvisor TestProxy: true - MatrixConfigs: - - Name: metricadvisor_ci_matrix - Path: eng/pipelines/templates/stages/platform-matrix-metricsadvisor_tables.json - Selection: sparse - GenerateVMJobs: true Artifacts: - name: azure-ai-metricsadvisor safeName: azureaimetricsadvisor diff --git a/sdk/schemaregistry/ci.yml b/sdk/schemaregistry/ci.yml index 232669a34c5a..a680610888b5 100644 --- a/sdk/schemaregistry/ci.yml +++ b/sdk/schemaregistry/ci.yml @@ -27,11 +27,6 @@ extends: template: ../../eng/pipelines/templates/stages/archetype-sdk-client.yml parameters: ServiceDirectory: schemaregistry - MatrixConfigs: - - Name: schemaregistry_ci_matrix - Path: eng/pipelines/templates/stages/platform-matrix-metricsadvisor_tables.json - Selection: sparse - GenerateVMJobs: true Artifacts: - name: azure-schemaregistry safeName: azureschemaregistry diff --git a/sdk/storage/ci.yml b/sdk/storage/ci.yml index f17dcb934171..f1485fd49c5d 100644 --- a/sdk/storage/ci.yml +++ b/sdk/storage/ci.yml @@ -35,7 +35,7 @@ extends: # https://github.com/Azure/azure-sdk-for-python/issues/17837 MatrixConfigs: - Name: storage_ci_matrix - Path: eng/pipelines/templates/stages/platform-matrix-cryptography-dependency.json + Path: eng/pipelines/templates/stages/platform-matrix-excluding-pypy.json Selection: sparse GenerateVMJobs: true Artifacts: