Skip to content

Commit 7bdec56

Browse files
moreatimoreati
committed
ci: One Tox environment per Azure job
Should result in - better isolation of faults - easier retries of failed jobs - quicker test completion, to to more efficient queueing. This does not expand test coverage, merely rearranges the tests already run.
1 parent 65e343a commit 7bdec56

File tree

1 file changed

+123
-17
lines changed

1 file changed

+123
-17
lines changed

‎.ci/azure-pipelines.yml‎

Lines changed: 123 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -20,19 +20,35 @@ jobs:
2020
vmImage: macOS-10.15
2121
strategy:
2222
matrix:
23-
Mito27_27:
23+
Mito_27:
2424
python.version: '2.7'
2525
tox.env: py27-mode_mitogen
2626

2727
# TODO: test python3, python3 tests are broken
28-
Local_Py27:
28+
Loc_27_210:
2929
python.version: '2.7'
30-
tox.env: py27-mode_localhost-ansible{2.10,3,4}
30+
tox.env: py27-mode_localhost-ansible2.10
31+
Loc_27_3:
32+
python.version: '2.7'
33+
tox.env: py27-mode_localhost-ansible3
34+
Loc_27_4:
35+
python.version: '2.7'
36+
tox.env: py27-mode_localhost-ansible4
3137

3238
# NOTE: this hangs when ran in Ubuntu 18.04
33-
Vanilla_Py27:
39+
Van_27_210:
40+
python.version: '2.7'
41+
tox.env: py27-mode_localhost-ansible2.10
42+
STRATEGY: linear
43+
ANSIBLE_SKIP_TAGS: resource_intensive
44+
Van_27_3:
3445
python.version: '2.7'
35-
tox.env: py27-mode_localhost-ansible{2.10,3,4}
46+
tox.env: py27-mode_localhost-ansible3
47+
STRATEGY: linear
48+
ANSIBLE_SKIP_TAGS: resource_intensive
49+
Van_27_4:
50+
python.version: '2.7'
51+
tox.env: py27-mode_localhost-ansible4
3652
STRATEGY: linear
3753
ANSIBLE_SKIP_TAGS: resource_intensive
3854

@@ -45,17 +61,89 @@ jobs:
4561
- template: azure-pipelines-steps.yml
4662
strategy:
4763
matrix:
48-
Mito_Py27:
64+
Mito_27_centos6:
65+
python.version: '2.7'
66+
tox.env: py27-mode_mitogen-distro_centos6
67+
Mito_27_centos7:
68+
python.version: '2.7'
69+
tox.env: py27-mode_mitogen-distro_centos7
70+
Mito_27_centos8:
4971
python.version: '2.7'
50-
tox.env: py27-mode_mitogen-distro_{centos6,centos7,centos8,debian9,debian10,debian11,ubuntu1604,ubuntu1804,ubuntu2004}
72+
tox.env: py27-mode_mitogen-distro_centos8
73+
Mito_27_debian9:
74+
python.version: '2.7'
75+
tox.env: py27-mode_mitogen-distro_debian9
76+
Mito_27_debian10:
77+
python.version: '2.7'
78+
tox.env: py27-mode_mitogen-distro_debian10
79+
Mito_27_debian11:
80+
python.version: '2.7'
81+
tox.env: py27-mode_mitogen-distro_debian11
82+
Mito_27_ubuntu1604:
83+
python.version: '2.7'
84+
tox.env: py27-mode_mitogen-distro_ubuntu1604
85+
Mito_27_ubuntu1804:
86+
python.version: '2.7'
87+
tox.env: py27-mode_mitogen-distro_ubuntu1804
88+
Mito_27_ubuntu2004:
89+
python.version: '2.7'
90+
tox.env: py27-mode_mitogen-distro_ubuntu2004
5191

52-
Mito_Py36:
92+
Mito_36_centos6:
93+
python.version: '3.6'
94+
tox.env: py36-mode_mitogen-distro_centos6
95+
Mito_36_centos7:
96+
python.version: '3.6'
97+
tox.env: py36-mode_mitogen-distro_centos7
98+
Mito_36_centos8:
99+
python.version: '3.6'
100+
tox.env: py36-mode_mitogen-distro_centos8
101+
Mito_36_debian9:
53102
python.version: '3.6'
54-
tox.env: py36-mode_mitogen-distro_{centos6,centos7,centos8,debian9,debian10,debian11,ubuntu1604,ubuntu1804,ubuntu2004}
103+
tox.env: py36-mode_mitogen-distro_debian9
104+
Mito_36_debian10:
105+
python.version: '3.6'
106+
tox.env: py36-mode_mitogen-distro_debian10
107+
Mito_36_debian11:
108+
python.version: '3.6'
109+
tox.env: py36-mode_mitogen-distro_debian11
110+
Mito_36_ubuntu1604:
111+
python.version: '3.6'
112+
tox.env: py36-mode_mitogen-distro_ubuntu1604
113+
Mito_36_ubuntu1804:
114+
python.version: '3.6'
115+
tox.env: py36-mode_mitogen-distro_ubuntu1804
116+
Mito_36_ubuntu2004:
117+
python.version: '3.6'
118+
tox.env: py36-mode_mitogen-distro_ubuntu2004
55119

56-
Mito_Py39:
120+
Mito_39_centos6:
121+
python.version: '3.9'
122+
tox.env: py39-mode_mitogen-distro_centos6
123+
Mito_39_centos7:
124+
python.version: '3.9'
125+
tox.env: py39-mode_mitogen-distro_centos7
126+
Mito_39_centos8:
127+
python.version: '3.9'
128+
tox.env: py39-mode_mitogen-distro_centos8
129+
Mito_39_debian9:
130+
python.version: '3.9'
131+
tox.env: py39-mode_mitogen-distro_debian9
132+
Mito_39_debian10:
133+
python.version: '3.9'
134+
tox.env: py39-mode_mitogen-distro_debian10
135+
Mito_39_debian11:
57136
python.version: '3.9'
58-
tox.env: py39-mode_mitogen-distro_{centos6,centos7,centos8,debian9,debian10,debian11,ubuntu1604,ubuntu1804,ubuntu2004}
137+
tox.env: py39-mode_mitogen-distro_debian11
138+
Mito_39_ubuntu1604:
139+
python.version: '3.9'
140+
tox.env: py39-mode_mitogen-distro_ubuntu1604
141+
Mito_39_ubuntu1804:
142+
python.version: '3.9'
143+
tox.env: py39-mode_mitogen-distro_ubuntu1804
144+
Mito_39_ubuntu2004:
145+
python.version: '3.9'
146+
tox.env: py39-mode_mitogen-distro_ubuntu2004
59147

60148
#DebOps_2460_27_27:
61149
#python.version: '2.7'
@@ -94,14 +182,32 @@ jobs:
94182
#DISTROS: debian
95183
#STRATEGY: linear
96184

97-
Ansible_Py27:
185+
Ans_27_210:
186+
python.version: '2.7'
187+
tox.env: py27-mode_ansible-ansible2.10
188+
Ans_27_3:
189+
python.version: '2.7'
190+
tox.env: py27-mode_ansible-ansible3
191+
Ans_27_4:
98192
python.version: '2.7'
99-
tox.env: py27-mode_ansible-ansible{2.10,3,4}
193+
tox.env: py27-mode_ansible-ansible4
100194

101-
Ansible_Py36:
195+
Ans_36_210:
102196
python.version: '3.6'
103-
tox.env: py36-mode_ansible-ansible{2.10,3,4}
197+
tox.env: py36-mode_ansible-ansible2.10
198+
Ans_36_3:
199+
python.version: '3.6'
200+
tox.env: py36-mode_ansible-ansible3
201+
Ans_36_4:
202+
python.version: '3.6'
203+
tox.env: py36-mode_ansible-ansible4
104204

105-
Ansible_Py39:
205+
Ans_39_210:
206+
python.version: '3.9'
207+
tox.env: py39-mode_ansible-ansible2.10
208+
Ans_39_3:
209+
python.version: '3.9'
210+
tox.env: py39-mode_ansible-ansible3
211+
Ans_39_4:
106212
python.version: '3.9'
107-
tox.env: py39-mode_ansible-ansible{2.10,3,4}
213+
tox.env: py39-mode_ansible-ansible4

0 commit comments

Comments
 (0)