From: Kefu Chai <kchai@redhat.com>
Date: Tue, 7 Jan 2020 01:35:04 +0000 (+0800)
Subject: Revert "qa/tasks/cbt: include py2 deps on ubuntu for now"
X-Git-Tag: v15.1.0~272^2
X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=8f9e8cce0317cf47a944ca4c542f51d32b381257;p=ceph-ci.git

Revert "qa/tasks/cbt: include py2 deps on ubuntu for now"

This reverts commit 3f2270a1c4f7ce93304ca9228771254944c4b15c.

since https://github.com/ceph/cbt/pull/208 got merged, there is no need
to install python2 for cbt anymore.

Signed-off-by: Kefu Chai <kchai@redhat.com>
---

diff --git a/qa/tasks/cbt.py b/qa/tasks/cbt.py
index 37c071e5e97..c5567a05d02 100644
--- a/qa/tasks/cbt.py
+++ b/qa/tasks/cbt.py
@@ -78,8 +78,6 @@ class CBT(Task):
         else:
             install_cmd = ['sudo', 'apt-get', '-y', '--force-yes', 'install']
             cbt_depends = ['python3-yaml', 'python3-lxml', 'librbd-dev', 'collectl']
-            # include py2 for the time being
-            cbt_depends += ['python-yaml', 'python-lxml']
         self.first_mon.run(args=install_cmd + cbt_depends)
 
         benchmark_type = self.cbt_config.get('benchmarks').keys()[0]