Merge bashate/pep8 lint jobs in common job

Instead of launching two separate build jobs in our CI infrastructure,
one for bashate and one for pep8, launch a single one. While the jobs
are short, the setup of the images takes a long time, so this is
friendlier to our CI infrastructure.

Use the pep8 environment as common lint target and merge the bashate job
into it.

Change-Id: I96d0e3fe15b792d5bffcc487f712cc9e16c65856

tox.ini

@@ -1,7 +1,7 @@
 [tox]
 minversion = 1.6
 skipsdist = True
-envlist = docs,pep8,bashate,ansible-syntax,ansible-lint,ansible-functional
+envlist = docs,pep8,ansible-syntax,ansible-lint,ansible-functional
 
 [testenv]
 usedevelop = True
@@ -18,10 +18,13 @@ commands=
 deps = -r{toxinidir}/test-requirements.txt
 commands = {posargs}
 
-# Run hacking/flake8 check for all python files
+# Run various lint checks
 [testenv:pep8]
-deps = flake8
+deps =
+    bashate
+    flake8
 whitelist_externals = bash
+# Run hacking/flake8 check for all python files
 commands =
     bash -c "grep -Irl \
         -e '!/usr/bin/env python' \
@@ -34,20 +37,9 @@ commands =
         --exclude 'tox.ini' \
         --exclude '*.sh' \
         {toxinidir} | xargs flake8 --verbose"
-
-[flake8]
-# Ignores the following rules due to how ansible modules work in general
-#     F403 'from ansible.module_utils.basic import *' used; unable to detect undefined names
-#     H303  No wildcard (*) import.
-ignore=F403,H303
-
 # Run bashate check for all bash scripts
 # Ignores the following rules:
 #     E003: Indent not multiple of 4 (we prefer to use multiples of 2)
-[testenv:bashate]
-deps = bashate
-whitelist_externals = bash
-commands =
     bash -c "grep -Irl \
         -e '!/usr/bin/env bash' \
         -e '!/bin/bash' \
@@ -58,6 +50,12 @@ commands =
         --exclude 'tox.ini' \
         {toxinidir} | xargs bashate --verbose --ignore=E003"
 
+[flake8]
+# Ignores the following rules due to how ansible modules work in general
+#     F403 'from ansible.module_utils.basic import *' used; unable to detect undefined names
+#     H303  No wildcard (*) import.
+ignore=F403,H303
+
 [testenv:ansible-syntax]
 changedir = tests
 commands =