From: Patrick Donnelly <pdonnell@redhat.com>
Date: Tue, 18 Jun 2019 22:14:22 +0000 (-0700)
Subject: qa: elide python version config
X-Git-Tag: v15.1.0~2415^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=refs%2Fpull%2F28638%2Fhead;p=ceph.git

qa: elide python version config

This test doesn't actually use the config and cephfs-shell is py3 only.

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

diff --git a/qa/suites/fs/basic_functional/tasks/cephfs-shell.yaml b/qa/suites/fs/basic_functional/tasks/cephfs-shell.yaml
new file mode 100644
index 000000000000..93c1eb54e8f6
--- /dev/null
+++ b/qa/suites/fs/basic_functional/tasks/cephfs-shell.yaml
@@ -0,0 +1,8 @@
+# Right now, cephfs-shell is only available as a package on Ubuntu
+# This overrides the random distribution that's chosen in the other yaml fragments.
+os_type: ubuntu
+os_version: "18.04"
+tasks:
+  - cephfs_test_runner:
+      modules:
+        - tasks.cephfs.test_cephfs_shell
diff --git a/qa/suites/fs/basic_functional/tasks/cephfs-shell/+ b/qa/suites/fs/basic_functional/tasks/cephfs-shell/+
deleted file mode 100644
index e69de29bb2d1..000000000000
diff --git a/qa/suites/fs/basic_functional/tasks/cephfs-shell/.qa b/qa/suites/fs/basic_functional/tasks/cephfs-shell/.qa
deleted file mode 120000
index fea2489fdf6d..000000000000
--- a/qa/suites/fs/basic_functional/tasks/cephfs-shell/.qa
+++ /dev/null
@@ -1 +0,0 @@
-../.qa
\ No newline at end of file
diff --git a/qa/suites/fs/basic_functional/tasks/cephfs-shell/py-3.yaml b/qa/suites/fs/basic_functional/tasks/cephfs-shell/py-3.yaml
deleted file mode 100644
index 9bd4a922626c..000000000000
--- a/qa/suites/fs/basic_functional/tasks/cephfs-shell/py-3.yaml
+++ /dev/null
@@ -1,2 +0,0 @@
-overrides:
-  python: python3
diff --git a/qa/suites/fs/basic_functional/tasks/cephfs-shell/test.yaml b/qa/suites/fs/basic_functional/tasks/cephfs-shell/test.yaml
deleted file mode 100644
index 93c1eb54e8f6..000000000000
--- a/qa/suites/fs/basic_functional/tasks/cephfs-shell/test.yaml
+++ /dev/null
@@ -1,8 +0,0 @@
-# Right now, cephfs-shell is only available as a package on Ubuntu
-# This overrides the random distribution that's chosen in the other yaml fragments.
-os_type: ubuntu
-os_version: "18.04"
-tasks:
-  - cephfs_test_runner:
-      modules:
-        - tasks.cephfs.test_cephfs_shell
diff --git a/qa/tasks/cephfs/test_cephfs_shell.py b/qa/tasks/cephfs/test_cephfs_shell.py
index 43f8cf822c38..31f16b44a257 100644
--- a/qa/tasks/cephfs/test_cephfs_shell.py
+++ b/qa/tasks/cephfs/test_cephfs_shell.py
@@ -11,12 +11,6 @@ log = logging.getLogger(__name__)
 
 class TestCephFSShell(CephFSTestCase):
     CLIENTS_REQUIRED = 1
-    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: {}".format(self.py_version))
 
     def _cephfs_shell(self, cmd, opts=None, stdin=None):
         args = ["cephfs-shell", "-c", self.mount_a.config_path]