openstack
/
rally
Code Issues Proposed changes

Fixing docker-check jenkins job 

The python-fuelclient requirement conflicts with other ones.
See logs from the docker job for more details.

Change-Id: I055eaf619ae62752c5fba6d1db26c91dbbbc86cb
This commit is contained in:
Yaroslav Lobankov 2016-09-20 14:32:37 +03:00
parent edf0beb68a
commit 3d279c14bf
3 changed files with 3 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
optional-requirements.txt
View File

@ -7,6 +7,3 @@
# - package doesn't have releases
# If these rules do not relate to your package, feel free to propose it as main
# requirement to Rally (requirements.txt file).
# [do-not-touch] our plugins support only one version of fuelclient
python-fuelclient==6.1.0 # Apache Software License

5
rally/task/validation.py
View File

@ -574,9 +574,8 @@ def required_clients(config, clients, deployment, *components, **kwargs):
except ImportError:
return ValidationResult(
False,
_("Client for %s is not installed. To install it run "
"`pip install -r"
" optional-requirements.txt`") % client_component)
_("Client for {0} is not installed. To install it run "
"`pip install python-{0}client`").format(client_component))
@validator

3
tests/ci/sync_requirements.py
View File

@ -40,8 +40,7 @@ GLOBAL_REQUIREMENTS_LOCATIONS = (
GLOBAL_REQUIREMENTS_FILENAME = "global-requirements.txt"
RALLY_REQUIREMENTS_FILES = (
"requirements.txt",
"test-requirements.txt",
"optional-requirements.txt"
"test-requirements.txt"
)
DO_NOT_TOUCH_TAG = "[do-not-touch]"