qa/suites/rgw/tempest: use the latest tempest supporting py3.5

in case we need to use ubuntu xenial for testing, xenial only had python
3.5 packaged. and tempest 23.0 was the last version which supports
python3.5 and python2.7.

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 <kchai@redhat.com>
(cherry picked from commit 8cb3f0411d4e8ff32f54a447c638187f0e7e42ae)

diff --git a/qa/suites/rgw/tempest/tasks/rgw_tempest.yaml b/qa/suites/rgw/tempest/tasks/rgw_tempest.yaml
index 3f94dce94aa31da932dda4ccaf12fc501f79d046..e6a96c0ba7d89b81c25531e8d71a8f67623af388 100644 (file)
--- 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: d43223773d75d2e82fb33a1281038e611c41d0f3
       force-branch: master
       use-keystone-role: client.0
       auth:

diff --git a/qa/tasks/tempest.py b/qa/tasks/tempest.py
index c75bfbe966b966d233c626c29b305312cbeedbb8..13189fd54b5e1269ed211b1ad450c72e7a9d4cec 100644 (file)
--- 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: