Skip to content

Commit 0245b63

Browse files
authored
Ensure that mac runs on py311+ (Azure#38491)
* ensure that mac runs on py311+ by shifting it to a deliberate include for py311 * rework to instead use MatrixFilters in ml/ci.yml and storage/ci.yml instead of fully new matrices
1 parent 8902811 commit 0245b63

File tree

6 files changed

+30
-120
lines changed

6 files changed

+30
-120
lines changed

eng/pipelines/templates/stages/platform-matrix-excluding-pypy.json

Lines changed: 0 additions & 52 deletions
This file was deleted.

eng/pipelines/templates/stages/platform-matrix-no-313.json

Lines changed: 0 additions & 52 deletions
This file was deleted.

eng/pipelines/templates/stages/platform-matrix.json

Lines changed: 13 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,15 +6,25 @@
66
},
77
"matrix": {
88
"Agent": {
9-
"windows-2022": { "OSVmImage": "env:WINDOWSVMIMAGE", "Pool": "env:WINDOWSPOOL" },
109
"ubuntu-20.04": { "OSVmImage": "env:LINUXVMIMAGE", "Pool": "env:LINUXPOOL" },
11-
"macos-latest": { "OSVmImage": "env:MACVMIMAGE", "Pool": "env:MACPOOL" }
10+
"windows-2022": { "OSVmImage": "env:WINDOWSVMIMAGE", "Pool": "env:WINDOWSPOOL" }
1211
},
13-
"PythonVersion": [ "3.8", "3.11", "3.10", "3.12" ],
12+
"PythonVersion": [ "3.8", "3.10", "3.12" ],
1413
"CoverageArg": "--disablecov",
1514
"TestSamples": "false"
1615
},
1716
"include": [
17+
{
18+
"MacTestConfig": {
19+
"macos311": {
20+
"OSVmImage": "env:LINUXVMIMAGE",
21+
"Pool": "env:LINUXPOOL",
22+
"PythonVersion": "3.11",
23+
"CoverageArg": "--disablecov",
24+
"TestSamples": "false"
25+
}
26+
}
27+
},
1828
{
1929
"PyPyConfig": {
2030
"ubuntu2004_pypy39": {

sdk/ml/ci.yml

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -33,11 +33,8 @@ extends:
3333
ValidateFormatting: true
3434
TestTimeoutInMinutes: 75
3535
TestProxy: true
36-
MatrixConfigs:
37-
- Name: ml_ci_matrix
38-
Path: eng/pipelines/templates/stages/platform-matrix-no-313.json
39-
Selection: sparse
40-
GenerateVMJobs: true
36+
MatrixFilters:
37+
- PythonVersion=^(?!3\.13)
4138
# This is a short term solution to create API review for python azure-ml package only when running pipeline manually
4239
# Long term solution should be to have different versions on main branch and release branch for python package so APIView can have different revisions for each version.
4340
# Tracking issue: https://github.com/Azure/azure-sdk-for-python/issues/29196

sdk/storage/ci.yml

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -31,11 +31,8 @@ extends:
3131
ServiceDirectory: storage
3232
TestProxy: true
3333
TestTimeoutInMinutes: 120
34-
MatrixConfigs:
35-
- Name: storage_ci_matrix
36-
Path: eng/pipelines/templates/stages/platform-matrix-excluding-pypy.json
37-
Selection: sparse
38-
GenerateVMJobs: true
34+
MatrixFilters:
35+
- PythonVersion=^(?!pypy3).*
3936
Artifacts:
4037
- name: azure-storage-blob
4138
safeName: azurestorageblob

sdk/storage/platform-matrix-all-versions.json

Lines changed: 13 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,10 +7,9 @@
77
"matrix": {
88
"Agent": {
99
"Ubuntu-20.04": { "OSVmImage": "env:LINUXVMIMAGE", "Pool": "env:LINUXPOOL" },
10-
"windows-2022": { "OSVmImage": "env:WINDOWSVMIMAGE", "Pool": "env:WINDOWSPOOL" },
11-
"macos-latest": { "OSVmImage": "env:MACVMIMAGE", "Pool": "env:MACPOOL" }
10+
"windows-2022": { "OSVmImage": "env:WINDOWSVMIMAGE", "Pool": "env:WINDOWSPOOL" }
1211
},
13-
"PythonVersion": [ "3.8", "3.9", "3.10", "3.11" ],
12+
"PythonVersion": [ "3.8", "3.9", "3.10"],
1413
"CoverageArg": "--disablecov",
1514
"TestSamples": "false",
1615
"AZURE_LIVE_TEST_SERVICE_VERSION": [
@@ -24,6 +23,17 @@
2423
]
2524
},
2625
"include": [
26+
{
27+
"MacTestConfig": {
28+
"macos311": {
29+
"OSVmImage": "env:LINUXVMIMAGE",
30+
"Pool": "env:LINUXPOOL",
31+
"PythonVersion": "3.11",
32+
"CoverageArg": "--disablecov",
33+
"TestSamples": "false"
34+
}
35+
}
36+
},
2737
{
2838
"CoverageConfig": {
2939
"ubuntu2004_pypy39": {

0 commit comments

Comments
 (0)