Merge "make the tox.ini indent uniform"

This commit is contained in:
Jenkins 2015-12-31 14:47:04 +00:00 committed by Gerrit Code Review
commit f38f9faf0d

58
tox.ini
View File

@ -11,7 +11,7 @@ passenv = http_proxy HTTP_PROXY https_proxy HTTPS_PROXY no_proxy NO_PROXY
[testenv:pep8] [testenv:pep8]
commands = commands =
flake8 flake8
[testenv:venv] [testenv:venv]
commands = {posargs} commands = {posargs}
@ -21,16 +21,16 @@ commands = python setup.py build_sphinx
[testenv:validate-contents] [testenv:validate-contents]
commands = commands =
{toxinidir}/tools/validate-all-json.sh {toxinidir}/tools/validate-all-json.sh
{toxinidir}/tools/validate-all-yaml.sh {toxinidir}/tools/validate-all-yaml.sh
{toxinidir}/tools/validate-all-maintainer.sh {toxinidir}/tools/validate-all-maintainer.sh
[testenv:bashate] [testenv:bashate]
deps = bashate deps = bashate
whitelist_externals = bash whitelist_externals = bash
# tox improperly interprets # and {1} in regex, so match on [[:punct:]]+ # tox improperly interprets # and {1} in regex, so match on [[:punct:]]+
commands = commands =
bash -c "files=`egrep -rlI --exclude-dir .git --exclude-dir .tox '^[[:punct:]]+!/(bin/|/usr/bin/env )(ba)?sh' .` && bashate $files" bash -c "files=`egrep -rlI --exclude-dir .git --exclude-dir .tox '^[[:punct:]]+!/(bin/|/usr/bin/env )(ba)?sh' .` && bashate $files"
[testenv:setupenv] [testenv:setupenv]
whitelist_externals = bash whitelist_externals = bash
@ -41,66 +41,66 @@ whitelist_externals = find
bash bash
sudo sudo
commands = commands =
find . -type f -name "*.pyc" -delete find . -type f -name "*.pyc" -delete
bash -c "if [ ! -d .testrepository ]; then testr init; fi" bash -c "if [ ! -d .testrepository ]; then testr init; fi"
sudo -g docker testr run test_build.BuildTestCentosBinary sudo -g docker testr run test_build.BuildTestCentosBinary
[testenv:build-centos-source] [testenv:build-centos-source]
whitelist_externals = find whitelist_externals = find
bash bash
sudo sudo
commands = commands =
find . -type f -name "*.pyc" -delete find . -type f -name "*.pyc" -delete
bash -c "if [ ! -d .testrepository ]; then testr init; fi" bash -c "if [ ! -d .testrepository ]; then testr init; fi"
sudo -g docker testr run test_build.BuildTestCentosSource sudo -g docker testr run test_build.BuildTestCentosSource
[testenv:build-ubuntu-source] [testenv:build-ubuntu-source]
whitelist_externals = find whitelist_externals = find
bash bash
sudo sudo
commands = commands =
find . -type f -name "*.pyc" -delete find . -type f -name "*.pyc" -delete
bash -c "if [ ! -d .testrepository ]; then testr init; fi" bash -c "if [ ! -d .testrepository ]; then testr init; fi"
sudo -g docker testr run test_build.BuildTestUbuntuSource sudo -g docker testr run test_build.BuildTestUbuntuSource
[testenv:deploy-centos-binary] [testenv:deploy-centos-binary]
whitelist_externals = find whitelist_externals = find
bash bash
sudo sudo
commands = commands =
find . -type f -name "*.pyc" -delete find . -type f -name "*.pyc" -delete
bash -c "if [ ! -d .testrepository ]; then testr init; fi" bash -c "if [ ! -d .testrepository ]; then testr init; fi"
sudo -g docker testr run test_build.DeployTestCentosBinary sudo -g docker testr run test_build.DeployTestCentosBinary
sudo tests/deploy_aio.sh centos binary sudo tests/deploy_aio.sh centos binary
[testenv:deploy-centos-source] [testenv:deploy-centos-source]
whitelist_externals = find whitelist_externals = find
bash bash
sudo sudo
commands = commands =
find . -type f -name "*.pyc" -delete find . -type f -name "*.pyc" -delete
bash -c "if [ ! -d .testrepository ]; then testr init; fi" bash -c "if [ ! -d .testrepository ]; then testr init; fi"
sudo -g docker testr run test_build.DeployTestCentosSource sudo -g docker testr run test_build.DeployTestCentosSource
sudo tests/deploy_aio.sh centos source sudo tests/deploy_aio.sh centos source
[testenv:deploy-ubuntu-source] [testenv:deploy-ubuntu-source]
whitelist_externals = find whitelist_externals = find
bash bash
sudo sudo
commands = commands =
find . -type f -name "*.pyc" -delete find . -type f -name "*.pyc" -delete
bash -c "if [ ! -d .testrepository ]; then testr init; fi" bash -c "if [ ! -d .testrepository ]; then testr init; fi"
sudo -g docker testr run test_build.DeployTestUbuntuSource sudo -g docker testr run test_build.DeployTestUbuntuSource
sudo tests/deploy_aio.sh ubuntu source sudo tests/deploy_aio.sh ubuntu source
[testenv:deploy-multinode-ubuntu-source] [testenv:deploy-multinode-ubuntu-source]
whitelist_externals = find whitelist_externals = find
bash bash
sudo sudo
commands = commands =
find . -type f -name "*.pyc" -delete find . -type f -name "*.pyc" -delete
bash -c "if [ ! -d .testrepository ]; then testr init; fi" bash -c "if [ ! -d .testrepository ]; then testr init; fi"
sudo -g docker testr run test_build.BuildTestUbuntuSource sudo -g docker testr run test_build.BuildTestUbuntuSource
[flake8] [flake8]
show-source = True show-source = True