diff --git a/run_tests.sh b/run_tests.sh index 55f044a67..45d525f98 100755 --- a/run_tests.sh +++ b/run_tests.sh @@ -21,7 +21,7 @@ BRANCH=stable/train # Find OS version and release source /etc/os-release -OS_NAME_VERS=${REDHAT_SUPPORT_PRODUCT}${REDHAT_SUPPORT_PRODUCT_VERSION} +OS_NAME_VERS=${ID}${VERSION_ID} # We could want to override the default repositories or install behavior INSTALL_FROM_SOURCE=${INSTALL_FROM_SOURCE:-true} diff --git a/test-requirements.txt b/test-requirements.txt index 421af3c32..f4a54b5b5 100644 --- a/test-requirements.txt +++ b/test-requirements.txt @@ -1,4 +1,4 @@ -sphinx>=1.6.2,<2.0.0 # BSD +sphinx>=1.6.2 # BSD openstackdocstheme>=1.17.0 # Apache-2.0 reno>=0.1.1 # Apache2 stestr>=1.0.0 # Apache-2.0 diff --git a/tox.ini b/tox.ini index 0f5772713..ad244998e 100644 --- a/tox.ini +++ b/tox.ini @@ -10,7 +10,7 @@ setenv = VIRTUAL_ENV={envdir} LANGUAGE=en_US:en LC_ALL=C deps = - -c{env:UPPER_CONSTRAINTS_FILE:https://releases.openstack.org/constraints/upper/master} + -c{env:UPPER_CONSTRAINTS_FILE:https://releases.openstack.org/constraints/upper/train} -r{toxinidir}/test-requirements.txt -r{toxinidir}/requirements.txt