]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
qa/tasks/cbt: install python3 deps 34193/head
authorSage Weil <sage@redhat.com>
Mon, 16 Dec 2019 16:17:26 +0000 (10:17 -0600)
committerKefu Chai <kchai@redhat.com>
Sun, 29 Mar 2020 04:34:17 +0000 (12:34 +0800)
Signed-off-by: Sage Weil <sage@redhat.com>
(cherry picked from commit 299375852a4b3210cf5b95d3559d69080f14339f)

Conflict: qa/tasks/cbt.py: change python3-yaml to python36-PyYAML,
  as in EL7, python3-* packages are still named python36-*

qa/tasks/cbt.py

index cef236cf26ed8b7ace7d0a588fd693ac037a3017..dfbeb5f835c51e44f363935fb0762500cb030884 100644 (file)
@@ -73,10 +73,10 @@ class CBT(Task):
 
         if system_type == 'rpm':
             install_cmd = ['sudo', 'yum', '-y', 'install']
-            cbt_depends = ['python-yaml', 'python-lxml', 'librbd-devel', 'pdsh', 'collectl']
+            cbt_depends = ['python36-PyYAML', 'python36-lxml', 'librbd-devel', 'pdsh', 'collectl']
         else:
             install_cmd = ['sudo', 'apt-get', '-y', '--force-yes', 'install']
-            cbt_depends = ['python-yaml', 'python-lxml', 'librbd-dev', 'collectl']
+            cbt_depends = ['python3-yaml', 'python3-lxml', 'librbd-dev', 'collectl']
         self.first_mon.run(args=install_cmd + cbt_depends)
 
         benchmark_type = self.cbt_config.get('benchmarks').keys()[0]