openstack
/
heat
Code Issues Proposed changes

Use upper constraints for all jobs in tox.ini 

Openstack infra now supports upper constraints for
all jobs. Updated tox.ini to use upper constraints
for all jobs.

It also contains one test fix from
I01c46197dfebb1eb674817ce81792972a06e529f to make the gate pass.

Change-Id: Ideae3fdbac5cd08bacad243302e6f8096346b4e0
Related-Bug: #1614361
(cherry picked from commit cfb07cb459)
This commit is contained in:
AvnishPal 2016-08-22 15:22:14 +05:30 committed by Tony Breeds
parent 4e095b37f8
commit 4d1674cbce
2 changed files with 2 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
heat_integrationtests/pre_test_hook.sh
View File

@ -33,6 +33,8 @@ echo -e 'notification_driver=messagingv2\n' >> $localconf
echo -e 'hidden_stack_tags=hidden\n' >> $localconf
echo -e 'encrypt_parameters_and_properties=True\n' >> $localconf
echo -e 'logging_exception_prefix=%(asctime)s.%(msecs)03d %(process)d TRACE %(name)s %(instance)s\n' >> $localconf
# Limit the number of connections, we're overflowing mysql
echo -e 'executor_thread_pool_size=8\n' >> $localconf
echo -e '[heat_api]\nworkers=2\n' >> $localconf
echo -e '[heat_api_cfn]\nworkers=2\n' >> $localconf

15
tox.ini
View File

@ -31,13 +31,9 @@ commands =
python tools/custom_guidelines.py --exclude heat/engine/resources/aws
[testenv:venv]
# Note: infra doesn't support to use of constraints for this target.
install_command = pip install -U --force-reinstall {opts} {packages}
commands = {posargs}
[testenv:cover]
# Note: infra doesn't support to use of constraints for this target.
install_command = pip install -U --force-reinstall {opts} {packages}
commands =
python setup.py testr --coverage --testr-args='^(?!heat_integrationtests){posargs}'
@ -51,16 +47,11 @@ commands = python setup.py build_sphinx
# This environment is called from CI scripts to test and publish
# the API Ref to developer.openstack.org.
#
# NOTE(sdague): this target does not use constraints because
# upstream infra does not yet support it. Once that's fixed, we can
# drop the install_command.
#
# we do not used -W here because we are doing some slightly tricky
# things to build a single page document, and as such, we are ok
# ignoring the duplicate stanzas warning.
whitelist_externals = bash
rm
install_command = pip install -U --force-reinstall {opts} {packages}
commands =
rm -rf api-ref/build
sphinx-build -b html -d api-ref/build/doctrees api-ref/source api-ref/build/html
@ -86,13 +77,7 @@ local-check-factory = heat.hacking.checks.factory
commands = oslo_debug_helper {posargs}
[testenv:releasenotes]
# Note: infra doesn't support to use of constraints for this target.
install_command = pip install -U --force-reinstall {opts} {packages}
commands = sphinx-build -a -E -W -d releasenotes/build/doctrees -b html releasenotes/source releasenotes/build/html
[testenv:install-guide]
# NOTE(jaegerandi): this target does not use constraints because
# upstream infra does not yet support it. Once that's fixed, we can
# drop the install_command.
install_command = pip install -U --force-reinstall {opts} {packages}
commands = sphinx-build -a -E -W -d install-guide/build/doctrees -b html install-guide/source install-guide/build/html