openstack/adjutant-ui
Code Issues Proposed changes

Fix horizon install

Browse Source 
Install horizon from git in OpenStack CI instead of from tarball.

Update tox.ini for this.

Change-Id: I78ec5f3cb2105dcaed6b3e3879af189d5890fbfc
This commit is contained in:
Andreas Jaeger 2018-03-23 08:55:16 +01:00
parent 70a73acdec
commit ccbbff0f8e
2 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
test-requirements.txt
View File

@ -25,6 +25,9 @@ sphinx>=1.5.1 # BSD
testtools>=1.4.0 # MIT testtools>=1.4.0 # MIT
# This also needs xvfb library installed on your OS # This also needs xvfb library installed on your OS
xvfbwrapper>=0.1.3 #license: MIT xvfbwrapper>=0.1.3 #license: MIT
# Include horizon as test requirement
http://tarballs.openstack.org/horizon/horizon-master.tar.gz#egg=horizon
sphinx-rtd-theme>=0.2.4 sphinx-rtd-theme>=0.2.4
# OpenStack CI will install the following projects from git
# if they are in the required-projects list for a job:
horizon>=13.0.0 # Apache-2.0

4
tox.ini
View File

@ -12,8 +12,8 @@ setenv = VIRTUAL_ENV={envdir}
NOSE_OPENSTACK_YELLOW=0.025 NOSE_OPENSTACK_YELLOW=0.025
NOSE_OPENSTACK_SHOW_ELAPSED=1 NOSE_OPENSTACK_SHOW_ELAPSED=1
DJANGO_SETTINGS_MODULE=adjutant_ui.test.settings DJANGO_SETTINGS_MODULE=adjutant_ui.test.settings
install_command = pip install -c{env:UPPER_CONSTRAINTS_FILE:https://git.openstack.org/cgit/openstack/requirements/plain/upper-constraints.txt} -U {opts} {packages} deps = -c{env:UPPER_CONSTRAINTS_FILE:https://git.openstack.org/cgit/openstack/requirements/plain/upper-constraints.txt}
deps = -r{toxinidir}/requirements.txt -r{toxinidir}/requirements.txt
-r{toxinidir}/test-requirements.txt -r{toxinidir}/test-requirements.txt
commands = python manage.py test {posargs} commands = python manage.py test {posargs}