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 965ad9717f6e3d72b37d40faa71cd4a0125c3b92..9e67e4f521face4f8747e6fc44d15f417aa4d607 100644 (file)
--- 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 45bdbc52e1af1e62ad5262a03f8b7f0c425e8ecd..bda9f0ea0e59c2c3a228d98718423ca56efc6912 100755 (executable)
--- 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 9ecbae30554d5bb7ef65cd38572972eb7478dfba..47969c63bee89d53f4f6f0922955c8df375463cd 100755 (executable)
--- 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