From: Casey Bodley <cbodley@redhat.com>
Date: Thu, 5 Aug 2021 19:05:36 +0000 (-0400)
Subject: qa/rgw: barbican and pykmip tasks upgrade pip before installing pytz
X-Git-Tag: v17.1.0~1165^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=e5a5b4e3794baf3f6bc86ed0c02ecfc8cc0f99b4;p=ceph.git

qa/rgw: barbican and pykmip tasks upgrade pip before installing pytz

Downloading https://files.pythonhosted.org/packages/9b/77/461087a514d2e8ece1c975d8216bc03f7048e6090c5166bc34115afdaa53/cryptography-3.4.7.tar.gz (546kB)
  Complete output from command python setup.py egg_info:

          =============================DEBUG ASSISTANCE==========================
          If you are seeing an error here please try the following to
          successfully install cryptography:

          Upgrade to the latest pip and try again. This will fix errors for most
          users. See: https://pip.pypa.io/en/stable/installing/#upgrading-pip
          =============================DEBUG ASSISTANCE==========================

  Traceback (most recent call last):
    File "<string>", line 1, in <module>
    File "/tmp/pip-build-7fhnk5us/cryptography/setup.py", line 14, in <module>
      from setuptools_rust import RustExtension
  ModuleNotFoundError: No module named 'setuptools_rust'

Fixes: https://tracker.ceph.com/issues/52070

Signed-off-by: Casey Bodley <cbodley@redhat.com>
---

diff --git a/qa/tasks/barbican.py b/qa/tasks/barbican.py
index 4d1354903df..d43568c6103 100644
--- a/qa/tasks/barbican.py
+++ b/qa/tasks/barbican.py
@@ -98,6 +98,8 @@ def setup_venv(ctx, config):
     for (client, _) in config.items():
         run_in_barbican_dir(ctx, client,
                             ['python3', '-m', 'venv', '.barbicanenv'])
+        run_in_barbican_venv(ctx, client,
+                             ['pip', 'install', '--upgrade', 'pip'])
         run_in_barbican_venv(ctx, client,
                              ['pip', 'install', 'pytz',
                               '-e', get_barbican_dir(ctx)])
diff --git a/qa/tasks/pykmip.py b/qa/tasks/pykmip.py
index 3491babc517..45a5af6891b 100644
--- a/qa/tasks/pykmip.py
+++ b/qa/tasks/pykmip.py
@@ -148,6 +148,7 @@ def setup_venv(ctx, config):
     log.info('Setting up virtualenv for pykmip...')
     for (client, _) in config.items():
         run_in_pykmip_dir(ctx, client, ['python3', '-m', 'venv', '.pykmipenv'])
+        run_in_pykmip_venv(ctx, client, ['pip', 'install', '--upgrade', 'pip'])
         run_in_pykmip_venv(ctx, client, ['pip', 'install', 'pytz', '-e', get_pykmip_dir(ctx)])
     yield