Skip to content

Commit e1d6451

Browse files
scbeddbenbp
andauthored
Adjust Cosmos Platform Matrix (Azure#41510)
* update public and internal builds for python - cosmos to spread tox environments across more jobs, versus forcing each emulator job to handle all tox environments. Co-authored-by: Ben Broderick Phillips <[email protected]>
1 parent 61c4c0b commit e1d6451

File tree

4 files changed

+173
-57
lines changed

4 files changed

+173
-57
lines changed

eng/pipelines/templates/stages/cosmos-sdk-client.yml

Lines changed: 10 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -18,16 +18,19 @@ extends:
1818
# Run only emulator tests in Emulator CI
1919
TestMarkArgument: cosmosEmulator
2020
ServiceDirectory: cosmos
21-
# The cosmos emulator hits limits running too many parallel tests on internal pipelines
22-
${{ if eq(variables['System.TeamProject'], 'internal') }}:
23-
ToxEnvParallel: '3'
2421
BeforeTestSteps:
2522
- template: /eng/common/pipelines/templates/steps/cosmos-emulator.yml
2623
parameters:
2724
StartParameters: '/noexplorer /noui /enablepreview /EnableSqlComputeEndpoint /SqlComputePort=9999 /disableratelimiting /partitioncount=50 /consistency=Session'
2825
MatrixConfigs:
29-
- Name: Python_cosmos_emulator
30-
Path: sdk/cosmos/cosmos-emulator-matrix.json
31-
Selection: all
32-
GenerateVMJobs: true
26+
- ${{ if eq(variables['Build.Reason'], 'PullRequest') }}:
27+
- Name: Python_cosmos_emulator
28+
Path: sdk/cosmos/cosmos-emulator-public-matrix.json
29+
Selection: all
30+
GenerateVMJobs: true
31+
- ${{ else }}:
32+
- Name: Python_cosmos_emulator
33+
Path: sdk/cosmos/cosmos-emulator-internal-matrix.json
34+
Selection: all
35+
GenerateVMJobs: true
3336
Artifacts: ${{ parameters.Artifacts }}
Lines changed: 94 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,94 @@
1+
{
2+
"displayNames": {
3+
"--disablecov": "",
4+
"false": "",
5+
"true": ""
6+
},
7+
"matrix": {
8+
"Agent": {
9+
"windows-2022": { "OSVmImage": "env:WINDOWSVMIMAGE", "Pool": "env:WINDOWSPOOL" }
10+
},
11+
"Account": {
12+
"_": {
13+
"ACCOUNT_HOST": "https://localhost:8081/",
14+
"ACCOUNT_KEY": "C2y6yDjf5/R+ob0N8A7Cgv30VRDJIWEHLM+4QDU5DE2nQ9nDuVTqobD4b8mGGyPMbIZnqyMsEcaGQy67XIw/Jw==",
15+
}
16+
},
17+
"EmulatorConfig": {
18+
"Emulator Tests Python 3.9 Standard": {
19+
"PythonVersion": "3.9",
20+
"CoverageArg": "--disablecov",
21+
"TestSamples": "false",
22+
"Run.ToxCustomEnvs": "whl,sdist"
23+
},
24+
"Emulator Tests Python 3.10 Standard": {
25+
"PythonVersion": "3.10",
26+
"CoverageArg": "--disablecov",
27+
"TestSamples": "false",
28+
"Run.ToxCustomEnvs": "whl,sdist"
29+
},
30+
"Emulator Tests Python 3.12 Standard": {
31+
"PythonVersion": "3.12",
32+
"CoverageArg": "--disablecov",
33+
"TestSamples": "false",
34+
"Run.ToxCustomEnvs": "whl,sdist"
35+
},
36+
"Emulator Tests Python 3.13 Standard": {
37+
"PythonVersion": "3.13",
38+
"CoverageArg": "--disablecov",
39+
"TestSamples": "false",
40+
"Run.ToxCustomEnvs": "whl,sdist"
41+
},
42+
43+
"Emulator Tests Python 3.9 Special": {
44+
"PythonVersion": "3.9",
45+
"CoverageArg": "--disablecov",
46+
"TestSamples": "false",
47+
"Run.ToxCustomEnvs": "depends,whl_no_aio"
48+
},
49+
"Emulator Tests Python 3.10 Special": {
50+
"PythonVersion": "3.10",
51+
"CoverageArg": "--disablecov",
52+
"TestSamples": "false",
53+
"Run.ToxCustomEnvs": "depends,whl_no_aio"
54+
},
55+
"Emulator Tests Python 3.12 Special": {
56+
"PythonVersion": "3.12",
57+
"CoverageArg": "--disablecov",
58+
"TestSamples": "false",
59+
"Run.ToxCustomEnvs": "depends,whl_no_aio"
60+
},
61+
"Emulator Tests Python 3.13 Special": {
62+
"PythonVersion": "3.13",
63+
"CoverageArg": "--disablecov",
64+
"TestSamples": "false",
65+
"Run.ToxCustomEnvs": "depends,whl_no_aio"
66+
},
67+
68+
"Emulator Tests Python 3.9 Dependency Checks": {
69+
"PythonVersion": "3.9",
70+
"CoverageArg": "--disablecov",
71+
"TestSamples": "false",
72+
"Run.ToxCustomEnvs": "latestdependency,mindependency"
73+
},
74+
"Emulator Tests Python 3.10 Dependency Checks": {
75+
"PythonVersion": "3.10",
76+
"CoverageArg": "--disablecov",
77+
"TestSamples": "false",
78+
"Run.ToxCustomEnvs": "latestdependency,mindependency"
79+
},
80+
"Emulator Tests Python 3.12 Dependency Checks": {
81+
"PythonVersion": "3.12",
82+
"CoverageArg": "--disablecov",
83+
"TestSamples": "false",
84+
"Run.ToxCustomEnvs": "latestdependency,mindependency"
85+
},
86+
"Emulator Tests Python 3.13 Dependency Checks": {
87+
"PythonVersion": "3.13",
88+
"CoverageArg": "--disablecov",
89+
"TestSamples": "false",
90+
"Run.ToxCustomEnvs": "latestdependency,mindependency"
91+
}
92+
}
93+
}
94+
}

sdk/cosmos/cosmos-emulator-matrix.json

Lines changed: 0 additions & 50 deletions
This file was deleted.
Lines changed: 69 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,69 @@
1+
{
2+
"displayNames": {
3+
"--disablecov": "",
4+
"false": "",
5+
"true": ""
6+
},
7+
"matrix": {
8+
"Agent": {
9+
"windows-2022": { "OSVmImage": "env:WINDOWSVMIMAGE", "Pool": "env:WINDOWSPOOL" }
10+
},
11+
"Account": {
12+
"_": {
13+
"ACCOUNT_HOST": "https://localhost:8081/",
14+
"ACCOUNT_KEY": "C2y6yDjf5/R+ob0N8A7Cgv30VRDJIWEHLM+4QDU5DE2nQ9nDuVTqobD4b8mGGyPMbIZnqyMsEcaGQy67XIw/Jw==",
15+
}
16+
},
17+
"EmulatorConfig": {
18+
"Emulator Tests Python 3.9 Standard": {
19+
"PythonVersion": "3.9",
20+
"CoverageArg": "--disablecov",
21+
"TestSamples": "false",
22+
"Run.ToxCustomEnvs": "whl,sdist"
23+
},
24+
"Emulator Tests Python 3.10 Standard": {
25+
"PythonVersion": "3.10",
26+
"CoverageArg": "--disablecov",
27+
"TestSamples": "false",
28+
"Run.ToxCustomEnvs": "whl,sdist"
29+
},
30+
"Emulator Tests Python 3.12 Standard": {
31+
"PythonVersion": "3.12",
32+
"CoverageArg": "--disablecov",
33+
"TestSamples": "false",
34+
"Run.ToxCustomEnvs": "whl,sdist"
35+
},
36+
"Emulator Tests Python 3.13 Standard": {
37+
"PythonVersion": "3.13",
38+
"CoverageArg": "--disablecov",
39+
"TestSamples": "false",
40+
"Run.ToxCustomEnvs": "whl,sdist"
41+
},
42+
43+
"Emulator Tests Python 3.9 Dependency Checks": {
44+
"PythonVersion": "3.9",
45+
"CoverageArg": "--disablecov",
46+
"TestSamples": "false",
47+
"Run.ToxCustomEnvs": "mindependency"
48+
},
49+
"Emulator Tests Python 3.10 Dependency Checks": {
50+
"PythonVersion": "3.10",
51+
"CoverageArg": "--disablecov",
52+
"TestSamples": "false",
53+
"Run.ToxCustomEnvs": "mindependency"
54+
},
55+
"Emulator Tests Python 3.12 Dependency Checks": {
56+
"PythonVersion": "3.12",
57+
"CoverageArg": "--disablecov",
58+
"TestSamples": "false",
59+
"Run.ToxCustomEnvs": "mindependency"
60+
},
61+
"Emulator Tests Python 3.13 Dependency Checks": {
62+
"PythonVersion": "3.13",
63+
"CoverageArg": "--disablecov",
64+
"TestSamples": "false",
65+
"Run.ToxCustomEnvs": "mindependency"
66+
}
67+
}
68+
}
69+
}

0 commit comments

Comments
 (0)