diff --git a/neutron/tests/contrib/post_test_hook.sh b/neutron/tests/contrib/post_test_hook.sh index fbb305efc48..201503bb19c 100644 --- a/neutron/tests/contrib/post_test_hook.sh +++ b/neutron/tests/contrib/post_test_hook.sh @@ -60,10 +60,6 @@ fi cd $NEUTRON_DIR sudo chown -R $owner:stack $NEUTRON_DIR -# NOTE(armax): this is a gate hook and we should run in a constrained env -# to avoid breakage from uncontrolled upper constraints -venv=$venv-constraints - # Run tests echo "Running neutron $venv test suite" set +e diff --git a/tools/configure_for_func_testing.sh b/tools/configure_for_func_testing.sh index 3bedf0902eb..e6d1957dcb1 100755 --- a/tools/configure_for_func_testing.sh +++ b/tools/configure_for_func_testing.sh @@ -51,11 +51,6 @@ done # Default to environment variables to permit the gate_hook to override # when sourcing. VENV=${VENV:-dsvm-functional} -# If executed in the gate, run in a constrained env -if [[ "$IS_GATE" == "True" && "$USE_CONSTRAINT_ENV" == "True" ]] -then - VENV=$VENV-constraints -fi DEVSTACK_PATH=${DEVSTACK_PATH:-$1} PROJECT_NAME=${PROJECT_NAME:-neutron} REPO_BASE=${GATE_DEST:-$(cd $(dirname "$0")/../.. && pwd)} diff --git a/tox.ini b/tox.ini index 7c739b3f8a7..08ff6c32348 100644 --- a/tox.ini +++ b/tox.ini @@ -25,24 +25,11 @@ setenv = {[testenv]setenv} TEMPEST_CONFIG_DIR={env:TEMPEST_CONFIG_DIR:/opt/stack/tempest/etc} OS_TEST_API_WITH_REST=1 -[testenv:api-constraints] -basepython = {[testenv:api]basepython} -passenv = {[testenv:api]passenv} -setenv = {[testenv:api]setenv} - [testenv:common] # Fake job to define environment variables shared between dsvm/non-dsvm jobs setenv = OS_TEST_TIMEOUT=180 commands = false -# TODO(ihrachys): remove this target once it is not used in gate -[testenv:py27-constraints] -basepython = python2.7 - -# TODO(ihrachys): remove this target once it is not used in gate -[testenv:py34-constraints] -basepython = python3.4 - [testenv:dsvm] # Fake job to define environment variables shared between dsvm jobs setenv = OS_SUDO_TESTING=1 @@ -60,12 +47,6 @@ deps = {[testenv]deps} -r{toxinidir}/neutron/tests/functional/requirements.txt -[testenv:functional-constraints] -basepython = {[testenv:functional]basepython} -setenv = {[testenv:functional]setenv} -deps = - {[testenv:functional]deps} - [testenv:functional-py34] basepython = python3.4 setenv = {[testenv:functional]setenv} @@ -83,16 +64,6 @@ commands = {toxinidir}/tools/deploy_rootwrap.sh {toxinidir} {envdir}/etc {envdir}/bin {toxinidir}/tools/ostestr_compat_shim.sh {posargs} -[testenv:dsvm-functional-constraints] -basepython = {[testenv:dsvm-functional]basepython} -setenv = {[testenv:dsvm-functional]setenv} -sitepackages={[testenv:dsvm-functional]sitepackages} -deps = - {[testenv:functional-constraints]deps} -commands = - {toxinidir}/tools/deploy_rootwrap.sh {toxinidir} {envdir}/etc {envdir}/bin - {toxinidir}/tools/ostestr_compat_shim.sh {posargs} - [testenv:dsvm-functional-py34] basepython = python3.4 setenv = {[testenv:dsvm-functional]setenv} @@ -112,13 +83,6 @@ sitepackages=True deps = {[testenv:functional]deps} -[testenv:dsvm-fullstack-constraints] -setenv = - {[testenv:dsvm-fullstack]setenv} -sitepackages={[testenv:dsvm-fullstack]sitepackages} -deps = - {[testenv:functional-constraints]deps} - [testenv:releasenotes] # TODO(ihrachys): remove once infra supports constraints for this target install_command = {toxinidir}/tools/tox_install.sh unconstrained {opts} {packages} @@ -141,21 +105,6 @@ whitelist_externals = sh bash -[testenv:pep8-constraints] -basepython = {[testenv:pep8]basepython} -deps = - {[testenv]deps} -commands= - # If it is easier to add a check via a shell script, consider adding it in this file - sh ./tools/misc-sanity-checks.sh - {toxinidir}/tools/check_unit_test_structure.sh - # Checks for coding and style guidelines - flake8 - sh ./tools/coding-checks.sh --pylint '{posargs}' - neutron-db-manage --config-file neutron/tests/etc/neutron.conf check_migration - {[testenv:genconfig]commands} -whitelist_externals = {[testenv:pep8]whitelist_externals} - [testenv:cover] # TODO(ihrachys): remove once infra supports constraints for this target install_command = {toxinidir}/tools/tox_install.sh unconstrained {opts} {packages} @@ -169,18 +118,9 @@ commands = install_command = {toxinidir}/tools/tox_install.sh unconstrained {opts} {packages} commands = {posargs} -# TODO(ihrachys): remove this target once it is not used in gate -[testenv:venv-constraints] -# TODO(ihrachys): remove once infra supports constraints for this target -install_command = {toxinidir}/tools/tox_install.sh unconstrained {opts} {packages} -commands = {posargs} - [testenv:docs] commands = sphinx-build -W -b html doc/source doc/build/html -[testenv:docs-constraints] -commands = {[testenv:docs]commands} - [flake8] # E125 continuation line does not distinguish itself from next logical line # E126 continuation line over-indented for hanging indent