Skip to content

Commit b2a9ebd

Browse files
pombredannepombredanne
committed
Rebalance CI jobs
Add new OSes and consolidate some jobs for more balanced runtime Signed-off-by: Philippe Ombredanne <[email protected]>
1 parent 472e6f2 commit b2a9ebd

File tree

1 file changed

+65
-97
lines changed

1 file changed

+65
-97
lines changed

‎azure-pipelines.yml‎

Lines changed: 65 additions & 97 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11

2-
32
jobs:
43

54
################################################################################
@@ -15,54 +14,36 @@ jobs:
1514
misc: |
1615
bin/py.test -n 2 -vvs --reruns=3 --test-suite=all \
1716
--ignore=tests/scancode \
18-
--ignore=tests/packagedcode \
19-
--ignore=tests/plugincode \
20-
--ignore=tests/extractcode \
2117
--ignore=tests/cluecode \
2218
--ignore=tests/formattedcode \
2319
--ignore=tests/licensedcode
2420
25-
scancode: |
26-
bin/py.test -vvs --reruns=3 --test-suite=all \
27-
tests/scancode
28-
29-
extract_packaged_plugincode: |
30-
bin/py.test -vvs --reruns=3 --test-suite=all \
31-
tests/packagedcode tests/plugincode tests/extractcode
21+
scancode: bin/py.test --reruns=3 -vvs --test-suite=all tests/scancode
3222

33-
cluecode: bin/py.test -n 3 -vvs --test-suite=all tests/cluecode
23+
cluecode: bin/py.test -n 2 --reruns=3 -vvs --test-suite=all tests/cluecode
3424

35-
summarycode: bin/py.test -n 3 -vvs tests/summarycode
25+
summarycode: bin/py.test -n 2 --reruns=3 -vvs --test-suite=all tests/summarycode
3626

37-
formattedcode: bin/py.test -n 3 -vvs --test-suite=all tests/formattedcode
27+
formattedcode: bin/py.test -n 2 --reruns=3 -vvs --test-suite=all tests/formattedcode
3828

3929
license_base: |
40-
bin/py.test -n 3 -vvs --test-suite=all \
41-
tests/licensedcode --ignore=tests/licensedcode/test_zzzz_cache.py \
42-
--ignore=tests/licensedcode/test_detection_datadriven.py
30+
bin/py.test -n 2 --reruns=3 -vvs --test-suite=all \
31+
--ignore=tests/licensedcode/test_zzzz_cache.py \
32+
--ignore=tests/licensedcode/test_detection_datadriven.py \
33+
tests/licensedcode
4334
4435
license_main: |
45-
bin/py.test -n 3 -vvs --test-suite=all \
36+
bin/py.test -n 2 --reruns=3 -vvs --test-suite=all \
4637
tests/licensedcode/test_detection_datadriven.py \
4738
-k TestLicenseDataDriven
4839
49-
license_retro_spdx: |
50-
bin/py.test -n 3 -vvs --test-suite=all \
40+
license_retro_spdx_slic: |
41+
bin/py.test -n 2 --reruns=3 -vvs --test-suite=all \
5142
tests/licensedcode/test_detection_datadriven.py \
52-
-k "TestLicenseRetrographyDataDriven or TestLicenseSpdxDataDriven"
53-
54-
license_tools_slic: |
55-
bin/py.test -n 3 -vvs --test-suite=all \
56-
tests/licensedcode/test_detection_datadriven.py \
57-
-k "TestLicenseToolsDataDriven or TestSlicDataDriven"
58-
59-
license_foss_deb: |
60-
bin/py.test -n 3 -vvs --test-suite=all \
61-
tests/licensedcode/test_detection_datadriven.py \
62-
-k "TestFossLicDataDriven or TestDebLicCheckTestsDataDriven"
43+
-k "TestLicenseRetrographyDataDriven or TestLicenseSpdxDataDriven or TestLicenseToolsDataDriven or TestSlicDataDriven or TestFossLicDataDriven or TestDebLicCheckTestsDataDriven"
6344
6445
license_cache: |
65-
bin/py.test -n 3 --reruns=3 -vvs --test-suite=all \
46+
bin/py.test -n 2 --reruns=3 -vvs --test-suite=all \
6647
tests/licensedcode/test_zzzz_cache.py
6748
6849
- template: etc/ci/azure-win.yml
@@ -109,9 +90,8 @@ jobs:
10990
# python_path: python2.7
11091
# python_version: '2.7'
11192
# install_python: sudo apt-get install -y python python-dev
112-
# test_suite_label: base
113-
# test_suite: |
114-
# bin/py.test -n 3 -vvs
93+
# test_suite_label: all
94+
# test_suite: bin/py.test -n 2 -vvs --reruns=3
11595

11696
- template: etc/ci/azure-container-deb.yml
11797
parameters:
@@ -120,21 +100,19 @@ jobs:
120100
python_path: python2.7
121101
python_version: '2.7'
122102
install_python: sudo apt-get install -y python python-dev
123-
test_suite_label: base
124-
test_suite: |
125-
bin/py.test -n 3 -vvs
103+
test_suite_label: all
104+
test_suite: bin/py.test -n 2 -vvs --reruns=3
105+
106+
- template: etc/ci/azure-container-rpm.yml
107+
parameters:
108+
job_name: centos7_py27
109+
container: centos:7
110+
python_path: python2.7
111+
python_version: '2.7'
112+
install_python: sudo yum install -y python python27-devel
113+
test_suite_label: all
114+
test_suite: bin/py.test -n 2 -vvs --reruns=3
126115

127-
# - template: etc/ci/azure-container-rpm.yml
128-
# parameters:
129-
# job_name: centos7_py27
130-
# container: centos:7
131-
# python_path: python2.7
132-
# python_version: '2.7'
133-
# install_python: sudo yum install -y python python27-devel
134-
# test_suite_label: base
135-
# test_suite: |
136-
# bin/py.test -n 3 -vvs
137-
#
138116
# - template: etc/ci/azure-container-rpm.yml
139117
# parameters:
140118
# job_name: manylinux1_py27
@@ -143,9 +121,8 @@ jobs:
143121
# python_version: '2.7'
144122
# install_packages: echo "No extra packages for now"
145123
# install_python: echo "Python is pre-installed"
146-
# test_suite_label: base
147-
# test_suite: |
148-
# bin/py.test -n 3 -vvs
124+
# test_suite_label: all
125+
# test_suite: bin/py.test -n 2 -vvs --reruns=3
149126
#
150127
# - template: etc/ci/azure-container-rpm.yml
151128
# parameters:
@@ -155,9 +132,8 @@ jobs:
155132
# python_version: '2.7'
156133
# install_packages: echo "No extra packages for now"
157134
# install_python: echo "Python is pre-installed"
158-
# test_suite_label: base
159-
# test_suite: |
160-
# bin/py.test -n 3 -vvs
135+
# test_suite_label: all
136+
# test_suite: bin/py.test -n 2 -vvs --reruns=3
161137
#
162138
# - template: etc/ci/azure-container-rpm.yml
163139
# parameters:
@@ -169,9 +145,8 @@ jobs:
169145
# install_python: |
170146
# set -e -x
171147
# sudo dnf install -y python2 python2-devel
172-
# test_suite_label: base
173-
# test_suite: |
174-
# bin/py.test -n 3 -vvs
148+
# test_suite_label: all
149+
# test_suite: bin/py.test -n 2 -vvs --reruns=3
175150
#
176151
# - template: etc/ci/azure-container-deb.yml
177152
# parameters:
@@ -180,9 +155,8 @@ jobs:
180155
# python_path: python2.7
181156
# python_version: '2.7'
182157
# install_python: sudo apt-get install -y python python-dev
183-
# test_suite_label: base
184-
# test_suite: |
185-
# bin/py.test -n 3 -vvs
158+
# test_suite_label: all
159+
# test_suite: bin/py.test -n 2 -vvs --reruns=3
186160

187161
########################################################################
188162
# RELEASE on 2.7
@@ -224,7 +198,6 @@ jobs:
224198
displayName: 'Build installable releases'
225199

226200

227-
228201
################################################################################
229202
# These jobs are using VMs and Azure-provided Pythons 3.6
230203
################################################################################
@@ -235,26 +208,23 @@ jobs:
235208
image_name: ubuntu-16.04
236209
python_versions: ['3.6']
237210
test_suites:
238-
all: bin/py.test -n 2 -vvs --reruns=3 --ignore=tests/scancode
239-
scancode: bin/py.test -vvs --reruns=3 tests/scancode
211+
all: bin/py.test -n 2 -vvs --reruns=3
240212

241213
- template: etc/ci/azure-mac.yml
242214
parameters:
243215
job_name: macos_1013_py36
244216
image_name: macos-10.13
245217
python_versions: ['3.6']
246218
test_suites:
247-
all: bin/py.test -n 2 -vvs --reruns=3 --ignore=tests/scancode
248-
scancode: bin/py.test -vvs --reruns=3 tests/scancode
219+
all: bin/py.test -n 2 -vvs --reruns=3
249220

250221
- template: etc/ci/azure-mac.yml
251222
parameters:
252223
job_name: macos1014_py36
253224
image_name: macos-10.14
254225
python_versions: ['3.6']
255226
test_suites:
256-
all: bin/py.test -n 2 -vvs --reruns=3 --ignore=tests/scancode
257-
scancode: bin/py.test -vvs --reruns=3 tests/scancode
227+
all: bin/py.test -n 2 -vvs --reruns=3
258228

259229
- template: etc/ci/azure-win.yml
260230
parameters:
@@ -274,19 +244,19 @@ jobs:
274244
# These jobs are using containers and their own Python 3.6
275245
################################################################################
276246

277-
# - template: etc/ci/azure-container-deb.yml
278-
# parameters:
279-
# job_name: ubuntu16_py36
280-
# container: ubuntu:xenial
281-
# python_path: python3.6
282-
# python_version: '3.6'
283-
# install_python: |
284-
# sudo apt-get -y install software-properties-common
285-
# sudo add-apt-repository -y ppa:deadsnakes
286-
# sudo apt-get -y update
287-
# sudo apt-get install -y python3.6 python3.6-venv python3.6-dev
288-
# test_suite_label: commoncode
289-
# test_suite: bin/pytest -vvs tests/commoncode
247+
- template: etc/ci/azure-container-deb.yml
248+
parameters:
249+
job_name: ubuntu16_py36
250+
container: ubuntu:xenial
251+
python_path: python3.6
252+
python_version: '3.6'
253+
install_python: |
254+
sudo apt-get -y install software-properties-common
255+
sudo add-apt-repository -y ppa:deadsnakes
256+
sudo apt-get -y update
257+
sudo apt-get install -y python3.6 python3.6-venv python3.6-dev
258+
test_suite_label: all
259+
test_suite: bin/py.test -n 2 -vvs --reruns=3
290260

291261
- template: etc/ci/azure-container-deb.yml
292262
parameters:
@@ -295,10 +265,8 @@ jobs:
295265
python_path: python3.6
296266
python_version: '3.6'
297267
install_python: sudo apt-get install -y python3.6 python3.6-venv python3.6-dev
298-
test_suite_label: basic tests
299-
test_suite: |
300-
bin/py.test -n 2 -vvs --reruns=3 --ignore=tests/scancode
301-
bin/py.test -vvs --reruns=3 tests/scancode
268+
test_suite_label: all
269+
test_suite: bin/py.test -n 2 -vvs --reruns=3
302270

303271
# - template: etc/ci/azure-container-rpm.yml
304272
# parameters:
@@ -310,8 +278,8 @@ jobs:
310278
# set -e -x
311279
# sudo yum install -y epel-release
312280
# sudo yum install -y python36 python36-devel python36-virtualenv
313-
# test_suite_label: commoncode
314-
# test_suite: bin/pytest -vvs tests/commoncode
281+
# test_suite_label: all
282+
# test_suite: bin/py.test -n 2 -vvs --reruns=3
315283
#
316284
# - template: etc/ci/azure-container-rpm.yml
317285
# parameters:
@@ -321,8 +289,8 @@ jobs:
321289
# python_version: '3.6'
322290
# install_packages: echo "No extra packages for now"
323291
# install_python: echo "Python is pre-installed"
324-
# test_suite_label: commoncode
325-
# test_suite: bin/pytest -vvs tests/commoncode
292+
# test_suite_label: all
293+
# test_suite: bin/py.test -n 2 -vvs --reruns=3
326294
#
327295
# - template: etc/ci/azure-container-rpm.yml
328296
# parameters:
@@ -332,8 +300,8 @@ jobs:
332300
# python_version: '3.6'
333301
# install_packages: echo "No extra packages for now"
334302
# install_python: echo "Python is pre-installed"
335-
# test_suite_label: commoncode
336-
# test_suite: bin/pytest -vvs tests/commoncode
303+
# test_suite_label: all
304+
# test_suite: bin/py.test -n 2 -vvs --reruns=3
337305
#
338306

339307
################################################################################
@@ -350,8 +318,8 @@ jobs:
350318
# install_python: |
351319
# set -e -x
352320
# sudo dnf install -y python3 python3-devel python3-virtualenv
353-
# test_suite_label: commoncode
354-
# test_suite: bin/pytest -vvs tests/commoncode
321+
# test_suite_label: all
322+
# test_suite: bin/py.test -n 2 -vvs --reruns=3
355323
#
356324
# - template: etc/ci/azure-container-rpm.yml
357325
# parameters:
@@ -361,8 +329,8 @@ jobs:
361329
# python_version: '3.7'
362330
# install_packages: echo "No extra packages for now"
363331
# install_python: echo "Python is pre-installed"
364-
# test_suite_label: commoncode
365-
# test_suite: bin/pytest -vvs tests/commoncode
332+
# test_suite_label: all
333+
# test_suite: bin/py.test -n 2 -vvs --reruns=3
366334

367335

368336
################################################################################
@@ -392,8 +360,8 @@ jobs:
392360
# ./configure --enable-optimizations
393361
# make -j8
394362
# sudo make altinstall
395-
# test_suite_label: commoncode
396-
# test_suite: bin/pytest -vvs tests/commoncode
363+
# test_suite_label: basic tests
364+
# test_suite: bin/py.test -n 2 -vvs --reruns=3
397365

398366

399367
################################################################################

0 commit comments

Comments
 (0)