diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index e2feffdcbb7a425b1ff701aa7ecc323f59947b01..3851b9d25abee2b088a3fcd9389a3219969aca0a 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -10,14 +10,15 @@ build: - master unit_tests: stage: test + coverage: /^TOTAL\s+\d+\s+\d+\s+\d+\s+\d+\s+(\d+)%$/ script: - - python setup.py nosetests + - nosetests --with-coverage # vagrant_backed_tests # stage: test # script: # - vagrant ssh -c 'sudo shutdown -P +10' -# - vagrant ssh -c 'cd /vagrant; python setup.py nosetests' +# - vagrant ssh -c 'cd /vagrant; nosetests --with-coverage' # before_script: # - vagrant up # after_script: diff --git a/README.md b/README.md index 89547d8e2321876973ca85f51486ad8bb561f786..553365c4907daa25632e8641c4386d5f96cf4dac 100644 --- a/README.md +++ b/README.md @@ -28,10 +28,7 @@ This is a generic scaffold for Python projects that use: Vagrant environment 13. Set up a repository on GitLab 14. Ensure you have _master_ permission on this repository -15. Set `^TOTAL\s+\d+\s+\d+\s+\d+\s+\d+\s+(\d+)%$` in - _Settings>CI/CD Pipelines>Test coverage parsing_ for GitLab to display - test coverage data -16. `git init` -17. Add suitable remotes, commit the data, push to repo -18. Done! +15. `git init` +16. Add suitable remotes, commit the data, push to repo +17. Done!