We are experiencing that the 'main' job is getting slower, so let's move some
of the tests off to other tasks, e.g to 'users' which is regularly done
much more quickly.

This is reducing the total amount of runtime too, currently by approx ~1-2 minutes.
This commit is contained in:
Christopher Grebs 2018-09-17 09:10:18 +02:00 коммит произвёл GitHub
Родитель 1b75b8cd48
Коммит 091c72a54f
Не найден ключ, соответствующий данной подписи
Идентификатор ключа GPG: 4AEE18F83AFDEB23
2 изменённых файлов: 21 добавлений и 10 удалений

Просмотреть файл

@ -15,9 +15,9 @@ jobs:
- { stage: python2, env: TOXENV=es }
- { stage: python2, env: TOXENV=addons }
- { stage: python2, env: TOXENV=devhub }
- { stage: python2, env: TOXENV=reviewers }
- { stage: python2, env: TOXENV=reviewers-and-zadmin }
- { stage: python2, env: TOXENV=amo-locales-and-signing }
- { stage: python2, env: TOXENV=users-and-accounts }
- { stage: python2, env: TOXENV=users-accounts-and-ratings }
- { stage: python2, env: TOXENV=main }
- { stage: python3, python: 3.6, env: TOXENV=codestyle}
- { stage: python3, python: 3.6, env: TOXENV=docs }
@ -25,9 +25,9 @@ jobs:
- { stage: python3, python: 3.6, env: TOXENV=es }
- { stage: python3, python: 3.6, env: TOXENV=addons }
- { stage: python3, python: 3.6, env: TOXENV=devhub }
- { stage: python3, python: 3.6, env: TOXENV=reviewers }
- { stage: python3, python: 3.6, env: TOXENV=reviewers-and-zadmin }
- { stage: python3, python: 3.6, env: TOXENV=amo-locales-and-signing }
- { stage: python3, python: 3.6, env: TOXENV=users-and-accounts }
- { stage: python3, python: 3.6, env: TOXENV=users-accounts-and-ratings }
- { stage: python3, python: 3.6, env: TOXENV=main }
env:

23
tox.ini
Просмотреть файл

@ -1,5 +1,5 @@
[tox]
envlist = es, addons, devhub, reviewers, main, ui-tests, flake8, docs, assets
envlist = es, addons, amo-locales-and-signin, devhub, reviewers-and-zadmin, users-accounts-and-ratings, main, ui-tests, flake8, docs, assets
[travis]
@ -34,10 +34,10 @@ commands =
make -f Makefile-docker install_python_test_dependencies install_node_dependencies
pytest -n 2 -m 'not es_tests and not needs_locales_compilation and not static_assets' -v src/olympia/devhub/ {posargs}
[testenv:reviewers]
[testenv:reviewers-and-zadmin]
commands =
make -f Makefile-docker install_python_test_dependencies
pytest -n 2 -m 'not es_tests and not needs_locales_compilation and not static_assets' -v src/olympia/reviewers/ {posargs}
pytest -n 2 -m 'not es_tests and not needs_locales_compilation and not static_assets' -v src/olympia/reviewers/ src/olympia/zadmin/ {posargs}
[testenv:amo-locales-and-signing]
commands =
@ -46,15 +46,26 @@ commands =
bash {toxinidir}/locale/compile-mo.sh {toxinidir}/locale/
pytest -n 2 -m 'needs_locales_compilation' -v src/olympia/ {posargs}
[testenv:users-and-accounts]
[testenv:users-accounts-and-ratings]
commands =
make -f Makefile-docker install_python_test_dependencies
pytest -n 2 -m 'not es_tests and not needs_locales_compilation and not static_assets' -v src/olympia/users/ src/olympia/accounts/ {posargs}
pytest -n 2 -m 'not es_tests and not needs_locales_compilation and not static_assets' -v src/olympia/users/ src/olympia/accounts/ src/olympia/ratings/ {posargs}
[testenv:main]
commands =
make -f Makefile-docker install_python_test_dependencies install_node_dependencies
pytest -n 2 -m 'not es_tests and not needs_locales_compilation and not static_assets' -v src/olympia/ --ignore src/olympia/addons/ --ignore src/olympia/devhub/ --ignore src/olympia/reviewers/ --ignore src/olympia/amo/ --ignore src/olympia/users/ --ignore src/olympia/accounts/ --ignore src/olympia/lib/crypto --ignore src/olympia/signing {posargs}
pytest -n 2 -m 'not es_tests and not needs_locales_compilation and not static_assets' -v src/olympia/ \
--ignore src/olympia/addons/ \
--ignore src/olympia/devhub/ \
--ignore src/olympia/reviewers/ \
--ignore src/olympia/ratings/ \
--ignore src/olympia/amo/ \
--ignore src/olympia/users/ \
--ignore src/olympia/accounts/ \
--ignore src/olympia/lib/crypto \
--ignore src/olympia/signing \
--ignore src/olympia/zadmin \
{posargs}
[testenv:ui-tests]
commands =