From cfcb050093e1d1e45dc034054fb884fbce075977 Mon Sep 17 00:00:00 2001
From: Erno Kuvaja <jokke@usr.fi>
Date: Thu, 9 May 2019 10:56:53 +0100
Subject: Don't target broken ssl tests to specific py3.minor

Change-Id: I37d881315e801926bd5a7ae46402038fd69e060b
(cherry picked from commit 8aea36403d80fc5b278e5398bf539e0cee2bda6a)
---
 .zuul.yaml                           |  6 +++---
 broken-functional-py3-ssl-tests.txt  |  2 ++
 broken-functional-py35-ssl-tests.txt |  2 --
 tox.ini                              | 16 ++++++++--------
 4 files changed, 13 insertions(+), 13 deletions(-)
 create mode 100644 broken-functional-py3-ssl-tests.txt
 delete mode 100644 broken-functional-py35-ssl-tests.txt

diff --git a/.zuul.yaml b/.zuul.yaml
index 41ef0a124..9d774ff98 100644
--- a/.zuul.yaml
+++ b/.zuul.yaml
@@ -10,12 +10,12 @@
       - openstack/glance
 
 - job:
-    name: glance-eventlet-ssl-handshake-broken-py35
+    name: glance-eventlet-ssl-handshake-broken-py3
     parent: tox
     description: |
       See https://bugs.launchpad.net/glance/+bug/1482633
     vars:
-      tox_envlist: broken-py35-ssl-tests
+      tox_envlist: broken-py3-ssl-tests
     irrelevant-files:
       - ^(test-|)requirements.txt$
       - ^lower-constraints.txt$
@@ -214,7 +214,7 @@
       jobs:
         - openstack-tox-functional
         - openstack-tox-functional-py36
-        - glance-eventlet-ssl-handshake-broken-py35:
+        - glance-eventlet-ssl-handshake-broken-py3:
             voting: false
         - devstack-plugin-ceph-tempest:
             voting: false
diff --git a/broken-functional-py3-ssl-tests.txt b/broken-functional-py3-ssl-tests.txt
new file mode 100644
index 000000000..58c55b390
--- /dev/null
+++ b/broken-functional-py3-ssl-tests.txt
@@ -0,0 +1,2 @@
+^glance\.tests\.functional\.test_reload\.TestReload\.test_reload$
+^glance\.tests\.functional\.test_ssl\.TestSSL\.test_ssl_ok$
diff --git a/broken-functional-py35-ssl-tests.txt b/broken-functional-py35-ssl-tests.txt
deleted file mode 100644
index 58c55b390..000000000
--- a/broken-functional-py35-ssl-tests.txt
+++ /dev/null
@@ -1,2 +0,0 @@
-^glance\.tests\.functional\.test_reload\.TestReload\.test_reload$
-^glance\.tests\.functional\.test_ssl\.TestSSL\.test_ssl_ok$
diff --git a/tox.ini b/tox.ini
index ed1e9e68d..be3b0aa01 100644
--- a/tox.ini
+++ b/tox.ini
@@ -59,7 +59,7 @@ ignore_errors = True
 whitelist_externals =
   bash
 commands =
-  stestr run --blacklist-file ./broken-functional-py35-ssl-tests.txt {posargs}
+  stestr run --blacklist-file ./broken-functional-py3-ssl-tests.txt {posargs}
 
 [testenv:functional-py36]
 basepython = python3.6
@@ -69,7 +69,7 @@ ignore_errors = True
 whitelist_externals =
   bash
 commands =
-  stestr run --blacklist-file ./broken-functional-py35-ssl-tests.txt {posargs}
+  stestr run --blacklist-file ./broken-functional-py3-ssl-tests.txt {posargs}
 
 [testenv:functional-py37]
 basepython = python3.7
@@ -79,18 +79,18 @@ ignore_errors = True
 whitelist_externals =
   bash
 commands =
-  stestr run --blacklist-file ./broken-functional-py35-ssl-tests.txt {posargs}
+  stestr run --blacklist-file ./broken-functional-py3-ssl-tests.txt {posargs}
 
-[testenv:broken-py35-ssl-tests]
+[testenv:broken-py3-ssl-tests]
 # NOTE(rosmaita): these tests were being skipped due to bug #1482633, but we
 # want it to be obvious that Glance is affected by the eventlet ssl-handshake
-# problem under py35.  (When this testenv is removed, don't forget to adjust
-# the blacklist generation in the functional-py35 testenv.)
-basepython = python3.5
+# problem under py3.  (When this testenv is removed, don't forget to adjust
+# the blacklist generation in the functional-py3 testenv.)
+basepython = python3
 setenv =
   TEST_PATH = ./glance/tests/functional
 commands =
-  stestr run --whitelist-file ./broken-functional-py35-ssl-tests.txt {posargs}
+  stestr run --whitelist-file ./broken-functional-py3-ssl-tests.txt {posargs}
 
 [testenv:pep8]
 basepython = python3
-- 
cgit v1.2.1