From dc31df08b90037607f76e271bbd52daef6a3ca05 Mon Sep 17 00:00:00 2001
From: Paul Belanger <pabelanger@redhat.com>
Date: Wed, 17 Feb 2016 16:08:13 -0500
Subject: [PATCH] New tox entry points for OpenStack

Signed-off-by: Paul Belanger <pabelanger@redhat.com>
---
 tox.ini | 44 +++++++++++++++++++++++++++-----------------
 1 file changed, 27 insertions(+), 17 deletions(-)

diff --git a/tox.ini b/tox.ini
index 23d78a3..a360d75 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,24 +1,16 @@
 [tox]
 minversion = 1.4.2
-envlist = ansible-lint,docs,pep8
+envlist = docs,linters
 skipsdist = True
 
 [testenv]
 deps = -r{toxinidir}/requirements.txt
        -r{toxinidir}/test-requirements.txt
 
-[testenv:ansible-lint]
-setenv =
-  ANSIBLE_CONFIG = tests/ansible.cfg
-whitelist_externals = bash
-commands =
-  bash -c "find . -type f -regex '.*.y[a]?ml' -print0 | xargs -t -n1 -0 \
-    ansible-lint"
-  bash -c "find tests -type f -regex '.*.y[a]?ml' -print | xargs -t -n1 \
-    ansible-playbook --syntax-check -i tests/inventory \
-    -e rolename=$(basename $(pwd)) > /dev/null"
+[testenv:docs]
+commands = python setup.py build_sphinx
 
-[testenv:ansible-functional]
+[testenv:functional]
 commands =
   ansible-playbook -i tests/inventory tests/test.yaml
 passenv = HOME
@@ -26,11 +18,29 @@ setenv =
   ANSIBLE_CONFIG = {toxinidir}/tests/ansible.cfg
   PYTHONUNBUFFERED = 1
 
-[testenv:docs]
-commands = python setup.py build_sphinx
-
-[testenv:pep8]
-commands = flake8
+[testenv:linters]
+setenv =
+  ANSIBLE_CONFIG = tests/ansible.cfg
+whitelist_externals = bash
+commands =
+  # PEP8 Lint Check
+  flake8
+  # Ansible Lint Check
+  bash -c "find . -type f -regex '.*.y[a]?ml' -print0 | xargs -t -n1 -0 \
+    ansible-lint"
+  # Ansible Syntax Check
+  bash -c "find tests -type f -regex '.*.y[a]?ml' -print | xargs -t -n1 \
+    ansible-playbook --syntax-check -i tests/inventory \
+    -e rolename=$(basename $(pwd)) > /dev/null"
 
 [testenv:venv]
 commands = {posargs}
+
+[flake8]
+# E123, E125 skipped as they are invalid PEP-8.
+
+show-source = True
+ignore = E123,E125
+builtins = _
+exclude=.venv,.git,.tox,dist,doc,*openstack/common*,*lib/python*,*egg,build
+