]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
qa/tasks/cbt: install python3 deps 32436/head
authorKefu Chai <kchai@redhat.com>
Fri, 27 Dec 2019 11:03:24 +0000 (19:03 +0800)
committerKefu Chai <kchai@redhat.com>
Tue, 7 Jan 2020 01:32:58 +0000 (09:32 +0800)
Signed-off-by: Sage Weil <sage@redhat.com>
(cherry picked from commit 299375852a4b3210cf5b95d3559d69080f14339f)

Conflicts:
qa/tasks/cbt.py: install python36-* instead of python3-*
packages. as in EL7, python packages is still versioned using minor
version, and they don't "Provide" python3-*.

qa/tasks/cbt.py

index b774cb56699009c0bfb2bf95e03410a8736ef8c2..e0a1720dd32ba57db7a43119f2ef3cbf18a95aed 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]