diff options
| author | Erno Kuvaja <jokke@usr.fi> | 2019-05-09 10:56:53 +0100 |
|---|---|---|
| committer | Luigi Toscano <ltoscano@redhat.com> | 2019-11-20 12:22:26 +0100 |
| commit | cfcb050093e1d1e45dc034054fb884fbce075977 (patch) | |
| tree | 5915f9f349ec8cebe03709b5f89913adfaa20ac6 | |
| parent | f43e33514e73eb26c34a55dd01bb500206a1a469 (diff) | |
| download | glance-cfcb050093e1d1e45dc034054fb884fbce075977.tar.gz | |
Don't target broken ssl tests to specific py3.minor
Change-Id: I37d881315e801926bd5a7ae46402038fd69e060b
(cherry picked from commit 8aea36403d80fc5b278e5398bf539e0cee2bda6a)
| -rw-r--r-- | .zuul.yaml | 6 | ||||
| -rw-r--r-- | broken-functional-py3-ssl-tests.txt (renamed from broken-functional-py35-ssl-tests.txt) | 0 | ||||
| -rw-r--r-- | tox.ini | 16 |
3 files changed, 11 insertions, 11 deletions
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-py35-ssl-tests.txt b/broken-functional-py3-ssl-tests.txt index 58c55b390..58c55b390 100644 --- a/broken-functional-py35-ssl-tests.txt +++ b/broken-functional-py3-ssl-tests.txt @@ -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 |