Fix multiple job failures

zuul_cloner errors during tox job setup, and pep8 complains too.

Change-Id: I1d1ca087982d7bdda983686775736ed258026aeb
This commit is contained in:
Armando Migliaccio 2016-04-01 18:10:49 -07:00
parent bfd5c71531
commit 1c9ae7cde3
4 changed files with 3 additions and 13 deletions

View File

@ -16,7 +16,7 @@
from cryptography.hazmat import backends
from cryptography.hazmat.primitives import serialization
from cryptography import x509
from neutron.i18n import _LE
from neutron_lbaas._i18n import _LE
from oslo_log import log as logging
import six

View File

@ -12,6 +12,7 @@
# License for the specific language governing permissions and limitations
# under the License.
from neutron_lbaas._i18n import _
from neutron_lbaas._i18n import _LI
from oslo_config import cfg
from oslo_log import log as logging

View File

@ -22,3 +22,4 @@ WebTest>=2.0 # MIT
reno>=0.1.1 # Apache2
# Needed to run DB commands in virtualenvs
PyMySQL>=0.6.2 # MIT License
tempest>=10.0.0 # Apache-2.0

12
tox.ini
View File

@ -75,9 +75,6 @@ passenv = TEMPEST_CONFIG_DIR
setenv =
OS_TEST_PATH={toxinidir}/neutron_lbaas/tests/tempest/v1/api
OS_TESTR_CONCURRENCY=1
deps =
{[testenv]deps}
git+https://git.openstack.org/openstack/tempest#egg=tempest
# If you are running the tests locally you should set the env variable
# TEMPEST_CONFIG_DIR=/opt/stack/tempest/etc
@ -87,9 +84,6 @@ passenv = TEMPEST_CONFIG_DIR
setenv =
OS_TEST_PATH={toxinidir}/neutron_lbaas/tests/tempest/v2/api
OS_TESTR_CONCURRENCY=1
deps =
{[testenv]deps}
git+https://git.openstack.org/openstack/tempest#egg=tempest
# If you are running the tests locally you should set the env variable
# TEMPEST_CONFIG_DIR=/opt/stack/tempest/etc
@ -99,9 +93,6 @@ passenv = TEMPEST_CONFIG_DIR
setenv =
OS_TEST_PATH={toxinidir}/neutron_lbaas/tests/tempest/v2/scenario
OS_TESTR_CONCURRENCY=1
deps =
{[testenv]deps}
git+https://git.openstack.org/openstack/tempest#egg=tempest
# If you are running the tests locally you should set the env variable
# TEMPEST_CONFIG_DIR=/opt/stack/tempest/etc
@ -111,9 +102,6 @@ passenv = TEMPEST_CONFIG_DIR
setenv =
OS_TEST_PATH={toxinidir}/neutron_lbaas/tests/tempest/v2/ddt
OS_TESTR_CONCURRENCY=1
deps =
{[testenv]deps}
git+https://git.openstack.org/openstack/tempest#egg=tempest
[testenv:genconfig]
commands = {toxinidir}/tools/generate_config_file_samples.sh