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.
Azure · Oct 21, 2023 · 9756e97 · 9756e97
1 parent 53d5e69
commit 9756e97
Show file tree

Hide file tree

Showing 10 changed files with 9 additions and 92 deletions.
diff --git a/eng/pipelines/templates/stages/platform-matrix-cryptography-dependency.json b/eng/pipelines/templates/stages/platform-matrix-cryptography-dependency.json
diff --git a/...latform-matrix-metricsadvisor_tables.json → ...tages/platform-matrix-excluding-pypy.json b/...latform-matrix-metricsadvisor_tables.json → ...tages/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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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: