Revert "Switch nova uuidsentinel with oslo_utils' uuidsentinel"

This reverts commit 87fdd92f3d. The
changes were not made in Rocky.

Updates UPPER_CONSTRAINTS_FILE for stable/rocky

Additionally, sets the nova dependency branch to stable/rocky.

Change-Id: I0fa03ffa83978787726c983f69560bba79ece7ba
This commit is contained in:
Claudiu Belu 2018-10-03 02:31:35 -07:00
parent 87fdd92f3d
commit 5a3a42d037
2 changed files with 4 additions and 4 deletions

View File

@ -21,7 +21,7 @@ import mock
from nova import exception
from nova import objects
from nova.tests.unit.objects import test_flavor
from oslo_utils.fixture import uuidsentinel as uuids
from nova.tests import uuidsentinel as uuids
from oslo_utils import units
import compute_hyperv.nova.conf

View File

@ -8,7 +8,7 @@ usedevelop = True
# tox is silly... these need to be separated by a newline....
whitelist_externals = bash
find
install_command = pip install -c{env:UPPER_CONSTRAINTS_FILE:https://git.openstack.org/cgit/openstack/requirements/plain/upper-constraints.txt} {opts} {packages}
install_command = pip install -c{env:UPPER_CONSTRAINTS_FILE:https://git.openstack.org/cgit/openstack/requirements/plain/upper-constraints.txt?h=stable/rocky} {opts} {packages}
# Note the hash seed is set to 0 until hyperv can be tested with a
# random hash seed successfully.
setenv = VIRTUAL_ENV={envdir}
@ -17,7 +17,7 @@ setenv = VIRTUAL_ENV={envdir}
LANGUAGE=en_US
deps = -r{toxinidir}/requirements.txt
-r{toxinidir}/test-requirements.txt
-egit+https://github.com/openstack/nova#egg=nova
-egit+https://github.com/openstack/nova@stable/rocky#egg=nova
commands =
find . -type f -name "*.pyc" -delete
stestr run --slowest {posargs}
@ -93,4 +93,4 @@ deps =
-c{toxinidir}/lower-constraints.txt
-r{toxinidir}/test-requirements.txt
-r{toxinidir}/requirements.txt
-egit+https://github.com/openstack/nova#egg=nova
-egit+https://github.com/openstack/nova@stable/rocky#egg=nova