From b76d3ad6de9ae55adffb7c96501d41518f89f4dd Mon Sep 17 00:00:00 2001
From: Gary Kotton <gkotton@vmware.com>
Date: Tue, 2 May 2017 12:10:39 +0300
Subject: [PATCH] Fix gate jobs

Change-Id: Ic323916666e14a60dca8f84b0089328f52ed42d2
---
 TESTING.rst           |  6 ------
 requirements.txt      | 14 +++++++-------
 test-requirements.txt |  5 ++---
 3 files changed, 9 insertions(+), 16 deletions(-)

diff --git a/TESTING.rst b/TESTING.rst
index 836e7f06d7..8abcd40e70 100644
--- a/TESTING.rst
+++ b/TESTING.rst
@@ -191,9 +191,3 @@ with pdb::
     $ ./.venv/bin/pip install pudb
 
     $ OS_POST_MORTEM_DEBUGGER=pudb ./run_tests.sh -d [test module path]
-
-References
-==========
-
-.. [#pudb] PUDB debugger:
-   https://pypi.python.org/pypi/pudb
diff --git a/requirements.txt b/requirements.txt
index f481cb88f4..0df7da4d90 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,24 +1,24 @@
 # The order of packages is significant, because pip processes them in the order
 # of appearance. Changing the order has an impact on the overall integration
 # process, which may cause wedges in the gate later.
-pbr>=2.0.0 # Apache-2.0
+pbr!=2.1.0,>=2.0.0 # Apache-2.0
 
 enum34;python_version=='2.7' or python_version=='2.6' or python_version=='3.3' # BSD
-eventlet!=0.18.3,>=0.18.2 # MIT
+eventlet!=0.18.3,<0.21.0,>=0.18.2 # MIT
 httplib2>=0.7.5 # MIT
 netaddr!=0.7.16,>=0.7.13 # BSD
 tenacity>=3.2.1 # Apache-2.0
-SQLAlchemy>=1.0.10 # MIT
+SQLAlchemy!=1.1.5,!=1.1.6,!=1.1.7,!=1.1.8,>=1.0.10 # MIT
 six>=1.9.0 # MIT
 stevedore>=1.20.0 # Apache-2.0
-neutron-lib>=1.2.0 # Apache-2.0
+neutron-lib>=1.7.0 # Apache-2.0
 osc-lib>=1.2.0 # Apache-2.0
 python-openstackclient>=3.3.0,!=3.10.0 # Apache-2.0
 oslo.concurrency>=3.8.0 # Apache-2.0
 oslo.config>=3.22.0 # Apache-2.0
-oslo.db>=4.15.0 # Apache-2.0
-oslo.i18n>=2.1.0 # Apache-2.0
-oslo.log>=3.11.0 # Apache-2.0
+oslo.db>=4.21.1 # Apache-2.0
+oslo.i18n!=3.15.2,>=2.1.0 # Apache-2.0
+oslo.log>=3.22.0 # Apache-2.0
 oslo.serialization>=1.10.0 # Apache-2.0
 oslo.service>=1.10.0 # Apache-2.0
 oslo.utils>=3.20.0 # Apache-2.0
diff --git a/test-requirements.txt b/test-requirements.txt
index dc1a19a231..95d92e69f9 100644
--- a/test-requirements.txt
+++ b/test-requirements.txt
@@ -1,14 +1,13 @@
 # The order of packages is significant, because pip processes them in the order
 # of appearance. Changing the order has an impact on the overall integration
 # process, which may cause wedges in the gate later.
-
 hacking!=0.13.0,<0.14,>=0.12.0 # Apache-2.0
 
-coverage>=4.0 # Apache-2.0
+coverage!=4.4,>=4.0 # Apache-2.0
 fixtures>=3.0.0 # Apache-2.0/BSD
 mock>=2.0 # BSD
 python-subunit>=0.0.18 # Apache-2.0/BSD
-sphinx>=1.5.1 # BSD
+sphinx!=1.6.1,>=1.5.1 # BSD
 psycopg2>=2.5 # LGPL/ZPL
 PyMySQL>=0.7.6 # MIT License
 oslosphinx>=4.7.0 # Apache-2.0