Merge PR ceph#37593 into master

* refs/pull/37593/head: qa/tasks/cephfs: Refactor test_volumes Reviewed-by: Rishabh Dave <[email protected]> Reviewed-by: Patrick Donnelly <[email protected]>
david-caro · Oct 12, 2020 · 473d8e9 · 473d8e9
2 parents 1edaa17 + d1d5d61
commit 473d8e9
Show file tree

Hide file tree

Showing 7 changed files with 1,763 additions and 1,733 deletions.
diff --git a/qa/suites/fs/basic_functional/tasks/volumes/% b/qa/suites/fs/basic_functional/tasks/volumes/%
diff --git a/...es/fs/basic_functional/tasks/volumes.yaml → ...c_functional/tasks/volumes/overrides.yaml b/...es/fs/basic_functional/tasks/volumes.yaml → ...c_functional/tasks/volumes/overrides.yaml
@@ -12,9 +12,3 @@ overrides:
       - is full \(reached quota
       - POOL_FULL
       - POOL_BACKFILLFULL
-
-tasks:
-  - cephfs_test_runner:
-      fail_on_skip: false
-      modules:
-        - tasks.cephfs.test_volumes
diff --git a/qa/suites/fs/basic_functional/tasks/volumes/test/basic.yaml b/qa/suites/fs/basic_functional/tasks/volumes/test/basic.yaml
@@ -0,0 +1,7 @@
+tasks:
+  - cephfs_test_runner:
+      fail_on_skip: false
+      modules:
+        - tasks.cephfs.test_volumes.TestVolumes
+        - tasks.cephfs.test_volumes.TestSubvolumeGroups
+        - tasks.cephfs.test_volumes.TestSubvolumes
diff --git a/qa/suites/fs/basic_functional/tasks/volumes/test/clone.yaml b/qa/suites/fs/basic_functional/tasks/volumes/test/clone.yaml
@@ -0,0 +1,5 @@
+tasks:
+  - cephfs_test_runner:
+      fail_on_skip: false
+      modules:
+        - tasks.cephfs.test_volumes.TestSubvolumeSnapshotClones
diff --git a/qa/suites/fs/basic_functional/tasks/volumes/test/misc.yaml b/qa/suites/fs/basic_functional/tasks/volumes/test/misc.yaml
@@ -0,0 +1,5 @@
+tasks:
+  - cephfs_test_runner:
+      fail_on_skip: false
+      modules:
+        - tasks.cephfs.test_volumes.TestMisc
diff --git a/qa/suites/fs/basic_functional/tasks/volumes/test/snapshot.yaml b/qa/suites/fs/basic_functional/tasks/volumes/test/snapshot.yaml
@@ -0,0 +1,6 @@
+tasks:
+  - cephfs_test_runner:
+      fail_on_skip: false
+      modules:
+        - tasks.cephfs.test_volumes.TestSubvolumeGroupSnapshots
+        - tasks.cephfs.test_volumes.TestSubvolumeSnapshots