From 9ed128775b2d891c0d8742d5f63a0e9cba377aed Mon Sep 17 00:00:00 2001 From: Kefu Chai Date: Fri, 29 May 2020 00:51:39 +0800 Subject: [PATCH] qa/suites/rgw/tempest: bump tempest version from 17 to 21 also do not replace link in tox.ini, as it is reachable. to address the issues of - pallets/markupsafe#116 - pypa/setuptools#2017 MarkupSafe is installed by https://opendev.org/openstack/requirements/raw/branch/stable/pike/upper-constraints.txt Signed-off-by: Kefu Chai Signed-off-by: Kefu Chai --- qa/suites/rgw/tempest/tasks/rgw_tempest.yaml | 2 +- qa/tasks/tempest.py | 9 --------- 2 files changed, 1 insertion(+), 10 deletions(-) diff --git a/qa/suites/rgw/tempest/tasks/rgw_tempest.yaml b/qa/suites/rgw/tempest/tasks/rgw_tempest.yaml index 7f3495de5ef526..8feff13260860d 100644 --- a/qa/suites/rgw/tempest/tasks/rgw_tempest.yaml +++ b/qa/suites/rgw/tempest/tasks/rgw_tempest.yaml @@ -40,7 +40,7 @@ tasks: use-keystone-role: client.0 - tempest: client.0: - sha1: d3fa46495a78160989120ba39793f7ba2e22d81c + sha1: c93345233e06c173a65a3edcb769c4220386b3bd force-branch: master use-keystone-role: client.0 auth: diff --git a/qa/tasks/tempest.py b/qa/tasks/tempest.py index c75bfbe966b966..13189fd54b5e12 100644 --- a/qa/tasks/tempest.py +++ b/qa/tasks/tempest.py @@ -60,15 +60,6 @@ def download(ctx, config): sha1 = cconf.get('sha1') if sha1 is not None: run_in_tempest_dir(ctx, client, [ 'git', 'reset', '--hard', sha1 ]) - - # tox.ini contains a dead link, replace it with the new one - from_url = 'https://git.openstack.org/cgit/openstack/requirements/plain/upper-constraints.txt' - to_url = 'https://opendev.org/openstack/requirements/raw/branch/stable/pike/upper-constraints.txt' - run_in_tempest_dir(ctx, client, [ - 'sed', '-i', - run.Raw('"s|{}|{}|"'.format(from_url, to_url)), - 'tox.ini' - ]) try: yield finally: