From: Patrick Donnelly <pdonnell@redhat.com>
Date: Wed, 6 Jun 2018 23:51:05 +0000 (-0700)
Subject: qa: test py2 and py3 for volume client
X-Git-Tag: v14.0.1~700^2~2
X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=a5e3b0512c8c4e5ffbd960b903f40871d1867601;p=ceph.git

qa: test py2 and py3 for volume client

Signed-off-by: Patrick Donnelly <pdonnell@redhat.com>
---

diff --git a/qa/suites/fs/basic_functional/tasks/volume-client.yaml b/qa/suites/fs/basic_functional/tasks/volume-client.yaml
deleted file mode 100644
index e8c850a05cdd6..0000000000000
--- a/qa/suites/fs/basic_functional/tasks/volume-client.yaml
+++ /dev/null
@@ -1,11 +0,0 @@
-
-overrides:
-  ceph:
-    conf:
-      global:
-        ms type: simple
-
-tasks:
-  - cephfs_test_runner:
-      modules:
-        - tasks.cephfs.test_volume_client
diff --git a/qa/suites/fs/basic_functional/tasks/volume-client/% b/qa/suites/fs/basic_functional/tasks/volume-client/%
new file mode 100644
index 0000000000000..e69de29bb2d1d
diff --git a/qa/suites/fs/basic_functional/tasks/volume-client/py/2.yaml b/qa/suites/fs/basic_functional/tasks/volume-client/py/2.yaml
new file mode 100644
index 0000000000000..e3924dd6be414
--- /dev/null
+++ b/qa/suites/fs/basic_functional/tasks/volume-client/py/2.yaml
@@ -0,0 +1,2 @@
+overrides:
+  python: python2
diff --git a/qa/suites/fs/basic_functional/tasks/volume-client/py/3.yaml b/qa/suites/fs/basic_functional/tasks/volume-client/py/3.yaml
new file mode 100644
index 0000000000000..9bd4a922626c3
--- /dev/null
+++ b/qa/suites/fs/basic_functional/tasks/volume-client/py/3.yaml
@@ -0,0 +1,2 @@
+overrides:
+  python: python3
diff --git a/qa/suites/fs/basic_functional/tasks/volume-client/test.yaml b/qa/suites/fs/basic_functional/tasks/volume-client/test.yaml
new file mode 100644
index 0000000000000..e8c850a05cdd6
--- /dev/null
+++ b/qa/suites/fs/basic_functional/tasks/volume-client/test.yaml
@@ -0,0 +1,11 @@
+
+overrides:
+  ceph:
+    conf:
+      global:
+        ms type: simple
+
+tasks:
+  - cephfs_test_runner:
+      modules:
+        - tasks.cephfs.test_volume_client
diff --git a/qa/tasks/cephfs/test_volume_client.py b/qa/tasks/cephfs/test_volume_client.py
index 471d74ec34593..06094dd6fe988 100644
--- a/qa/tasks/cephfs/test_volume_client.py
+++ b/qa/tasks/cephfs/test_volume_client.py
@@ -16,6 +16,11 @@ class TestVolumeClient(CephFSTestCase):
     CLIENTS_REQUIRED = 4
     py_version = 'python'
 
+    def setUp(self):
+        CephFSTestCase.setUp(self)
+        self.py_version = self.ctx.config.get('overrides', {}).get('python', 'python')
+        log.info("using python version: %s".format(self.py_version))
+
     def _volume_client_python(self, client, script, vol_prefix=None, ns_prefix=None):
         # Can't dedent this *and* the script we pass in, because they might have different
         # levels of indentation to begin with, so leave this string zero-indented