From ccbbff0f8ee1bc88c52894324eed29d4a6b20687 Mon Sep 17 00:00:00 2001 From: Andreas Jaeger Date: Fri, 23 Mar 2018 08:55:16 +0100 Subject: [PATCH] Fix horizon install Install horizon from git in OpenStack CI instead of from tarball. Update tox.ini for this. Change-Id: I78ec5f3cb2105dcaed6b3e3879af189d5890fbfc --- test-requirements.txt | 7 +++++-- tox.ini | 4 ++-- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/test-requirements.txt b/test-requirements.txt index 801b671..00090dd 100644 --- a/test-requirements.txt +++ b/test-requirements.txt @@ -25,6 +25,9 @@ sphinx>=1.5.1 # BSD testtools>=1.4.0 # MIT # This also needs xvfb library installed on your OS 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 + +# 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 + diff --git a/tox.ini b/tox.ini index 6166d25..b18647c 100644 --- a/tox.ini +++ b/tox.ini @@ -12,8 +12,8 @@ setenv = VIRTUAL_ENV={envdir} NOSE_OPENSTACK_YELLOW=0.025 NOSE_OPENSTACK_SHOW_ELAPSED=1 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 = -r{toxinidir}/requirements.txt +deps = -c{env:UPPER_CONSTRAINTS_FILE:https://git.openstack.org/cgit/openstack/requirements/plain/upper-constraints.txt} + -r{toxinidir}/requirements.txt -r{toxinidir}/test-requirements.txt commands = python manage.py test {posargs}