From: Alfredo Deza <adeza@redhat.com>
Date: Fri, 25 Oct 2019 15:49:54 +0000 (-0400)
Subject: qa/ceph-disk: use a Python2.7 compatible version of pytest
X-Git-Tag: v12.2.13~70^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=149ce7af588b9c052e41d687e722fee9b7255d7c;p=ceph.git

qa/ceph-disk: use a Python2.7 compatible version of pytest

Signed-off-by: Alfredo Deza <adeza@redhat.com>
---

diff --git a/qa/workunits/ceph-disk/ceph-disk.sh b/qa/workunits/ceph-disk/ceph-disk.sh
index 19737ccdc5e..49f45ae84f9 100755
--- a/qa/workunits/ceph-disk/ceph-disk.sh
+++ b/qa/workunits/ceph-disk/ceph-disk.sh
@@ -14,9 +14,9 @@ $PYTHON --version
 
 type pip
 
-# newer versions of pytest (e.g. 3.7.0) seem to work fine with Python 2.7,
-# so just grab the latest version
-sudo -H pip install pytest
+# pytest supports python 2.7 up until the pytest 4.6 release, the 5.x series
+# supports Python 3 only
+sudo -H pip install "pytest==4.6.6"
 $PYTHON -m pytest --version
 
 # complete the cluster setup done by the teuthology ceph task