From e1463c6b79ab42889b4046eaa31f5689250174d5 Mon Sep 17 00:00:00 2001 From: Felipe Monteiro Date: Fri, 18 May 2018 18:16:40 +0100 Subject: [PATCH] [trivial] Rename tox jobs for zuul This patchset renames the tox.ini jobs: * coverage => cover * lint => pep8 * unit => py35 to comply with OpenStack standards [0]. This is needed so that [1] works seamlessly (it will enable py35 and cover jobs for Drydock). [0] e.g. https://github.com/openstack/nova/blob/04469a5181b82b09a43bfd401fde6ab13ff80160/tox.ini#L119 [1] I174d5df008f6e000da1a3878afe75919312ea7aa Change-Id: I9ead2156cde9b1bbbec8374845653825158dec19 --- Makefile | 4 ++-- tox.ini | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/Makefile b/Makefile index d79f4e8a..c5a42afb 100644 --- a/Makefile +++ b/Makefile @@ -45,12 +45,12 @@ external_dep: requirements-host.txt # Run unit and Postgres integration tests in coverage mode .PHONY: coverage_test coverage_test: build_drydock external_dep - tox -re coverage + tox -re cover # Run just unit tests .PHONY: unit_tests unit_tests: external_dep - tox -re unit + tox -re py35 # Run the drydock container and exercise simple tests .PHONY: run_drydock diff --git a/tox.ini b/tox.ini index 35f63859..fe4414f2 100644 --- a/tox.ini +++ b/tox.ini @@ -1,5 +1,5 @@ [tox] -envlist = pep8,bandit,unit +envlist = py35,pep8,bandit [testenv] setenv = YAMLDIR = {toxinidir}/tests/yaml_samples/ @@ -25,7 +25,7 @@ commands= yapf -i -r --style=pep8 {toxinidir}/tests find {toxinidir}/drydock_provisioner -name '__init__.py' -exec yapf -i --style=pep8 \{\} ; -[testenv:unit] +[testenv:py35] usedevelop=True setenv= PYTHONWARNING=all @@ -45,7 +45,7 @@ commands= py.test \ {toxinidir}/tests/integration/postgres/{posargs} -[testenv:coverage] +[testenv:cover] usedevelop=True passenv=DOCKER_REGISTRY IMAGE_NAME IMAGE_PREFIX IMAGE_TAG setenv=