Don't target broken ssl tests to specific py3.minor

Change-Id: I37d881315e801926bd5a7ae46402038fd69e060b
This commit is contained in:
Erno Kuvaja 2019-05-09 10:56:53 +01:00
parent 61298a47e4
commit 8aea36403d
3 changed files with 11 additions and 11 deletions

View File

@ -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$
@ -233,7 +233,7 @@
jobs:
- openstack-tox-functional
- openstack-tox-functional-py35
- glance-eventlet-ssl-handshake-broken-py35:
- glance-eventlet-ssl-handshake-broken-py3:
voting: false
- glance-code-constants-check
- devstack-plugin-ceph-tempest:

16
tox.ini
View File

@ -57,7 +57,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
@ -67,7 +67,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
@ -77,18 +77,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:gateonly]
# NOTE(rosmaita): these tests catch configuration problems for some code