From a39c6ef2508826b87125017be04fcd8030dfb21c Mon Sep 17 00:00:00 2001 From: Sam Betts Date: Fri, 7 Jul 2017 11:20:29 +0100 Subject: [PATCH] Switch mitaka tests to mitaka-eol tag instead of branch Now stable/mitaka branch has been EOL'd and removed to continue to test against it we must reference the mitaka-eol tag instead of the branch. Change-Id: Ic3b6cab001c87e5d77a1f9c9bd48805d8fc95afd --- tools/tox_install.sh | 2 +- tox.ini | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/tools/tox_install.sh b/tools/tox_install.sh index b173cc8..64c8953 100755 --- a/tools/tox_install.sh +++ b/tools/tox_install.sh @@ -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 diff --git a/tox.ini b/tox.ini index 82eeaa3..106ef23 100644 --- a/tox.ini +++ b/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