From: Sage Weil <sage@redhat.com>
Date: Thu, 19 Dec 2019 22:35:45 +0000 (-0600)
Subject: qa/tasks/cbt: include py2 deps on ubuntu for now
X-Git-Tag: v15.1.0~418^2~1
X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=3f2270a1c4f7ce93304ca9228771254944c4b15c;p=ceph.git

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

...until cbt is converted to py3

Signed-off-by: Sage Weil <sage@redhat.com>
---

diff --git a/qa/tasks/cbt.py b/qa/tasks/cbt.py
index c5567a05d020e..37c071e5e9757 100644
--- a/qa/tasks/cbt.py
+++ b/qa/tasks/cbt.py
@@ -78,6 +78,8 @@ 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]