From: Sage Weil <sage@redhat.com>
Date: Fri, 13 Dec 2019 14:47:12 +0000 (-0600)
Subject: qa: use python3 for venvs etc
X-Git-Tag: v15.1.0~448^2~9
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=240154f114f7dff52787d503d35d0ab266c960a7;p=ceph.git

qa: use python3 for venvs etc

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

diff --git a/qa/tasks/vstart_runner.py b/qa/tasks/vstart_runner.py
index 965ad9717f6e..9e67e4f521fa 100644
--- a/qa/tasks/vstart_runner.py
+++ b/qa/tasks/vstart_runner.py
@@ -81,7 +81,7 @@ def respawn_in_path(lib_path, python_paths):
     else:
         lib_path_var = "LD_LIBRARY_PATH"
 
-    py_binary = os.environ.get("PYTHON", "python")
+    py_binary = os.environ.get("PYTHON", "python3")
 
     if lib_path_var in os.environ:
         if lib_path not in os.environ[lib_path_var]:
diff --git a/qa/workunits/rados/test_python.sh b/qa/workunits/rados/test_python.sh
index 45bdbc52e1af..bda9f0ea0e59 100755
--- a/qa/workunits/rados/test_python.sh
+++ b/qa/workunits/rados/test_python.sh
@@ -1,5 +1,5 @@
 #!/bin/sh -ex
 
 ceph osd pool create rbd
-${PYTHON:-python} -m nose -v $(dirname $0)/../../../src/test/pybind/test_rados.py
+${PYTHON:-python3} -m nose -v $(dirname $0)/../../../src/test/pybind/test_rados.py
 exit 0
diff --git a/qa/workunits/rgw/run-s3tests.sh b/qa/workunits/rgw/run-s3tests.sh
index 9ecbae30554d..47969c63bee8 100755
--- a/qa/workunits/rgw/run-s3tests.sh
+++ b/qa/workunits/rgw/run-s3tests.sh
@@ -30,7 +30,7 @@ cd $dir
 git clone https://github.com/ceph/s3-tests
 cd s3-tests
 git checkout ceph-$branch
-VIRTUALENV_PYTHON=/usr/bin/python2 ./bootstrap
+VIRTUALENV_PYTHON=/usr/bin/python3 ./bootstrap
 
 S3TEST_CONF=s3tests.conf.SAMPLE virtualenv/bin/nosetests -a '!fails_on_rgw,!lifecycle_expiration,!fails_strict_rfc2616' -v