From dda1508ef57d301ba95e7718c0f0d860c1eeaebb Mon Sep 17 00:00:00 2001
From: Colleen Murphy <colleen.murphy@suse.de>
Date: Fri, 1 Mar 2019 10:02:54 +0100
Subject: [PATCH] Update keystone libraries to latest version

Change-Id: Idb1f4565068da60a2205709471c80c5fcefd9178
---
 openstack/keystoneauth1/keystoneauth1.spec.j2            | 2 +-
 openstack/keystonemiddleware/keystonemiddleware.spec.j2  | 9 +++------
 .../python-keystoneclient/python-keystoneclient.spec.j2  | 8 +++-----
 3 files changed, 7 insertions(+), 12 deletions(-)

diff --git a/openstack/keystoneauth1/keystoneauth1.spec.j2 b/openstack/keystoneauth1/keystoneauth1.spec.j2
index 6833ba3c6..10fb58f9a 100644
--- a/openstack/keystoneauth1/keystoneauth1.spec.j2
+++ b/openstack/keystoneauth1/keystoneauth1.spec.j2
@@ -1,6 +1,6 @@
 %global sname keystoneauth1
 Name:           {{ py2name('keystoneauth1') }}
-Version:        3.11.2
+Version:        3.12.0
 Release:        0
 Summary:        OpenStack authenticating tools
 License:        {{ license('Apache-2.0') }}
diff --git a/openstack/keystonemiddleware/keystonemiddleware.spec.j2 b/openstack/keystonemiddleware/keystonemiddleware.spec.j2
index 24e2387b0..6a60b8485 100644
--- a/openstack/keystonemiddleware/keystonemiddleware.spec.j2
+++ b/openstack/keystonemiddleware/keystonemiddleware.spec.j2
@@ -1,6 +1,6 @@
 %global sname keystonemiddleware
 Name:           {{ py2name('keystonemiddleware') }}
-Version:        5.2.0
+Version:        6.0.0
 Release:        0
 Summary:        Middleware for OpenStack Identity
 License:        {{ license('Apache-2.0') }}
@@ -29,8 +29,8 @@ BuildRequires:  {{ py2pkg('python-memcached', py_versions=['py2', 'py3']) }}
 BuildRequires:  {{ py2pkg('requests', py_versions=['py2', 'py3']) }}
 BuildRequires:  {{ py2pkg('requests-mock', py_versions=['py2', 'py3']) }}
 BuildRequires:  {{ py2pkg('six', py_versions=['py2', 'py3']) }}
+BuildRequires:  {{ py2pkg('stestr', py_versions=['py2', 'py3']) }}
 BuildRequires:  {{ py2pkg('stevedore', py_versions=['py2', 'py3']) }}
-BuildRequires:  {{ py2pkg('testrepository', py_versions=['py2', 'py3']) }}
 BuildRequires:  {{ py2pkg('testresources', py_versions=['py2', 'py3']) }}
 BuildRequires:  {{ py2pkg('testtools', py_versions=['py2', 'py3']) }}
 Requires:       {{ py2pkg('WebOb') }}
@@ -82,10 +82,7 @@ PBR_VERSION=%{version} sphinx-build -b html doc/source doc/build/html
 rm -rf doc/build/html/.{doctrees,buildinfo}
 
 %check
-export PYTHONWARNINGS="ignore"
-%{python_expand rm -rf .testrepository
-$python setup.py testr
-}
+%python_exec -m stestr.cli run
 
 %files %python_files
 %license LICENSE
diff --git a/openstack/python-keystoneclient/python-keystoneclient.spec.j2 b/openstack/python-keystoneclient/python-keystoneclient.spec.j2
index 0ab4ecbdb..92adacc53 100644
--- a/openstack/python-keystoneclient/python-keystoneclient.spec.j2
+++ b/openstack/python-keystoneclient/python-keystoneclient.spec.j2
@@ -1,5 +1,5 @@
 {% set pypi_name = 'python-keystoneclient' %}
-{% set upstream_version = upstream_version('3.17.0') %}
+{% set upstream_version = upstream_version('3.19.0') %}
 {% set rpm_release = '1' %}
 {% set source = url_pypi() %}
 
@@ -27,7 +27,7 @@ BuildRequires:  {{ py2pkg('oslotest', py_versions=['py2', 'py3']) }}
 BuildRequires:  {{ py2pkg('pbr', py_versions=['py2', 'py3']) }}
 BuildRequires:  {{ py2pkg('requests-mock', py_versions=['py2', 'py3']) }}
 BuildRequires:  {{ py2pkg('six', py_versions=['py2', 'py3']) }}
-BuildRequires:  {{ py2pkg('testrepository', py_versions=['py2', 'py3']) }}
+BuildRequires:  {{ py2pkg('stestr', py_versions=['py2', 'py3']) }}
 BuildRequires:  {{ py2pkg('testresources', py_versions=['py2', 'py3']) }}
 BuildRequires:  {{ py2pkg('testscenarios', py_versions=['py2', 'py3']) }}
 Requires:       {{ py2pkg('debtcollector') }}
@@ -78,9 +78,7 @@ rm -fr %{buildroot}%{python2_sitelib}/tests
 rm -fr html/.doctrees html/.buildinfo
 
 %check
-%{python_expand rm -rf .testrepository
-$python setup.py testr
-}
+%python_exec -m stestr.cli run
 
 %files %{python_files}
 %doc README.rst