From ed65d983f7baa1c221be07f9af6567b4d4d12823 Mon Sep 17 00:00:00 2001 From: Felipe Monteiro Date: Fri, 18 May 2018 18:14:52 +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]. [0] e.g. https://github.com/openstack/nova/blob/04469a5181b82b09a43bfd401fde6ab13ff80160/tox.ini#L119 Change-Id: I1a542c5e36f29d3788df8a5ebdce3cbe49ab4046 --- Makefile | 4 ++-- tools/zuul/playbooks/zuul-linter.yaml | 2 +- tox.ini | 6 +++--- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/Makefile b/Makefile index cfc36241..8c721e11 100644 --- a/Makefile +++ b/Makefile @@ -36,11 +36,11 @@ docs: .PHONY: tests-unit tests-unit: - tox -e unit + tox -e py35 .PHONY: tests-pep8 tests-pep8: - tox -e lint + tox -e pep8 chartbanner: @echo Building charts: $(CHARTS) diff --git a/tools/zuul/playbooks/zuul-linter.yaml b/tools/zuul/playbooks/zuul-linter.yaml index 05ee4a63..dd379553 100644 --- a/tools/zuul/playbooks/zuul-linter.yaml +++ b/tools/zuul/playbooks/zuul-linter.yaml @@ -15,6 +15,6 @@ - hosts: primary tasks: - name: Execute a Whitespace Linter check - command: find . -not -path "*/\.*" -not -path "*/docs/build/*" -not -name "*.tgz" -type f -exec egrep -l " +$" {} \; + command: find . -not -path "*/\.*" -not -path "*/doc/build/*" -not -name "*.tgz" -type f -exec egrep -l " +$" {} \; register: result failed_when: result.stdout != "" diff --git a/tox.ini b/tox.ini index 8ced46ae..be59f95a 100644 --- a/tox.ini +++ b/tox.ini @@ -1,10 +1,10 @@ [tox] -envlist = lint,unit,bandit,docs +envlist = pep8,py35,bandit,docs [testenv] basepython=python3 -[testenv:unit] +[testenv:py35] setenv = PYTHONWARNING=all deps = -r{toxinidir}/requirements-frozen.txt @@ -48,7 +48,7 @@ whitelist_externals = sh commands = {toxinidir}/tools/lint_gate.sh -[testenv:lint] +[testenv:pep8] deps = yapf==0.20.0 flake8==3.5.0