From: Kefu Chai <kchai@redhat.com>
Date: Fri, 27 Dec 2019 11:03:24 +0000 (+0800)
Subject: qa/tasks/cbt: install python3 deps
X-Git-Tag: v14.2.8~20^2~71^2~1^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=refs%2Fpull%2F32436%2Fhead;p=ceph.git

qa/tasks/cbt: install python3 deps

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-*.
---

diff --git a/qa/tasks/cbt.py b/qa/tasks/cbt.py
index b774cb56699..e0a1720dd32 100644
--- a/qa/tasks/cbt.py
+++ b/qa/tasks/cbt.py
@@ -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]