Merge "Switch mitaka tests to mitaka-eol tag instead of branch"
This commit is contained in:
commit
ffb7d971bb
|
@ -32,7 +32,7 @@ if $(python -c "import neutron" 2> /dev/null); then
|
|||
elif [ -x $ZUUL_CLONER ]; then
|
||||
# Use zuul-cloner to clone openstack/neutron, this will ensure the Depends-On
|
||||
# references are retrieved from zuul and rebased into the repo, then installed.
|
||||
$ZUUL_CLONER --cache-dir /opt/git --branch $NEUTRON_BRANCH --workspace /tmp git://git.openstack.org openstack/neutron
|
||||
$ZUUL_CLONER --cache-dir /opt/git --zuul-ref $NEUTRON_BRANCH --workspace /tmp git://git.openstack.org openstack/neutron
|
||||
$install_cmd /tmp/openstack/neutron
|
||||
else
|
||||
# Install neutron from git.openstack.org
|
||||
|
|
2
tox.ini
2
tox.ini
|
@ -9,7 +9,7 @@ skipsdist = True
|
|||
setenv = VIRTUAL_ENV={envdir}
|
||||
PYTHONHASHSEED=0
|
||||
PYTHONWARNINGS=default::DeprecationWarning
|
||||
DEFAULT_NEUTRON_BRANCH=stable/mitaka
|
||||
DEFAULT_NEUTRON_BRANCH=mitaka-eol
|
||||
UPPER_CONSTRAINTS_FILE=https://git.openstack.org/cgit/openstack/requirements/plain/upper-constraints.txt?h=stable/mitaka
|
||||
passenv = TRACE_FAILONLY http_proxy HTTP_PROXY https_proxy HTTPS_PROXY no_proxy NO_PROXY NEUTRON_BRANCH NEUTRONCLIENT_BRANCH
|
||||
usedevelop = True
|
||||
|
|
Loading…
Reference in New Issue