Avoid running non-2.7 and non-3.6 python versions for windows/macos C…

…I tests (#17832) * Avoid running non-3.6 python versions for windows CI tests * Replace macos python ci test version with 3.6 to support crypto mindepends * Add separate base matrix for ci mindependency tests using cryptography 2.4.1
Azure · Apr 7, 2021 · e8f5cca · e8f5cca
1 parent 4d50ff1
commit e8f5cca
Show file tree

Hide file tree

Showing 7 changed files with 63 additions and 10 deletions.
diff --git a/eng/pipelines/templates/stages/platform-matrix-cryptography-dependency.json b/eng/pipelines/templates/stages/platform-matrix-cryptography-dependency.json
@@ -0,0 +1,28 @@
+{
+  "displayNames": {
+    "--disablecov": ""
+  },
+  "matrix": {
+    "Agent": {
+      "ubuntu-18.04": { "OSVmImage": "MMSUbuntu18.04", "Pool": "azsdk-pool-mms-ubuntu-1804-general" }
+    },
+    "PythonVersion": [ "pypy3", "3.6", "3.7", "3.8", "3.9" ],
+    "CoverageArg": "--disablecov"
+  },
+  "include": [
+    {
+      "Agent": {
+        "macOS-10.15": { "OSVmImage": "macOS-10.15", "Pool": "Azure Pipelines" }
+      },
+      "PythonVersion": "2.7",
+      "CoverageArg": "--disablecov"
+    },
+    {
+      "Agent": {
+        "windows-2019": { "OSVmImage": "MMS2019", "Pool": "azsdk-pool-mms-win-2019-general" }
+      },
+      "PythonVersion": "3.6",
+      "CoverageArg": "--disablecov"
+    }
+  ]
+}
diff --git a/eng/pipelines/templates/stages/platform-matrix.json b/eng/pipelines/templates/stages/platform-matrix.json
@@ -14,9 +14,9 @@
   "include": [
     {
       "CoverageConfig": {
-        "windows2019_39_coverage": {
-          "OSVmImage": "MMS2019",
-          "Pool": "azsdk-pool-mms-win-2019-general",
+        "ubuntu1804_39_coverage": {
+          "OSVmImage": "MMSUbuntu18.04",
+          "Pool": "azsdk-pool-mms-ubuntu-1804-general",
           "PythonVersion": "3.9",
           "CoverageArg": ""
         }

diff --git a/sdk/eventhub/ci.yml b/sdk/eventhub/ci.yml
@@ -35,6 +35,12 @@ extends:
   template: ../../eng/pipelines/templates/stages/archetype-sdk-client.yml
   parameters:
     ServiceDirectory: eventhub
+    # 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
+        Selection: sparse
+        GenerateVMJobs: true
     MatrixFilters:
       - PythonVersion=^(?!pypy3).*
     Artifacts:

diff --git a/sdk/identity/ci.yml b/sdk/identity/ci.yml
@@ -31,11 +31,12 @@ extends:
   template: ../../eng/pipelines/templates/stages/archetype-sdk-client.yml
   parameters:
     ServiceDirectory: identity
-    Artifacts:
-     - name: azure-identity
-       safeName: azureidentity
-    AdditionalMatrixConfigs:
-      - Name: Identity_ci_test
+    # Override the base matrix due to https://github.com/Azure/azure-sdk-for-python/issues/17837
+    MatrixConfigs:
+      - Name: identity_ci_matrix
         Path: sdk/identity/platform-matrix.json
         Selection: sparse
         GenerateVMJobs: true
+    Artifacts:
+     - name: azure-identity
+       safeName: azureidentity
diff --git a/sdk/identity/platform-matrix.json b/sdk/identity/platform-matrix.json
@@ -1,11 +1,17 @@
 {
+  "matrix": {
+    "$IMPORT": "eng/pipelines/templates/stages/platform-matrix-cryptography-dependency.json"
+  },
+  "exclude": [
+    { "PythonVersion": "3.7" }
+  ],
   "include": [
     {
       "Config": {
-        "ubuntu_18.04_3.5_msal": {
+        "ubuntu_18.04_3.7_msal": {
           "OSVmImage": "MMSUbuntu18.04",
           "Pool": "azsdk-pool-mms-ubuntu-1804-general",
-          "PythonVersion": "3.5",
+          "PythonVersion": "3.7",
           "CoverageArg": "--disablecov",
           "InjectedPackages": "git+https://github.com/AzureAD/microsoft-authentication-library-for-python@dev"
         }

diff --git a/sdk/keyvault/ci.yml b/sdk/keyvault/ci.yml
@@ -35,6 +35,12 @@ extends:
   template: ../../eng/pipelines/templates/stages/archetype-sdk-client.yml
   parameters:
     ServiceDirectory: keyvault
+    # 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
+        Selection: sparse
+        GenerateVMJobs: true
     Artifacts:
     - name: azure-keyvault-administration
       safename: azurekeyvaultadministration

diff --git a/sdk/storage/ci.yml b/sdk/storage/ci.yml
@@ -35,6 +35,12 @@ extends:
   template: ../../eng/pipelines/templates/stages/archetype-sdk-client.yml
   parameters:
     ServiceDirectory: storage
+    # Override the base matrix due to 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
+        Selection: sparse
+        GenerateVMJobs: true
     Artifacts:
     - name: azure-storage-blob
       safeName: azurestorageblob