From: Milind Changire <mchangir@redhat.com>
Date: Tue, 14 May 2024 06:25:38 +0000 (+0530)
Subject: qa: relocate subvol creation overrides and test
X-Git-Tag: v20.0.0~1062^2
X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=ef68253a87b764abedee71046a0e301d408ad11e;p=ceph.git

qa: relocate subvol creation overrides and test

Fixes: https://tracker.ceph.com/issues/65829
Signed-off-by: Milind Changire <mchangir@redhat.com>
---

diff --git a/qa/cephfs/overrides/subvol_versions/create_subvol_version_v1.yaml b/qa/cephfs/overrides/subvol_versions/create_subvol_version_v1.yaml
deleted file mode 100644
index 120b2bf04bee9..0000000000000
--- a/qa/cephfs/overrides/subvol_versions/create_subvol_version_v1.yaml
+++ /dev/null
@@ -1,2 +0,0 @@
-overrides:
-  subvolume_version: 1
diff --git a/qa/cephfs/overrides/subvol_versions/create_subvol_version_v2.yaml b/qa/cephfs/overrides/subvol_versions/create_subvol_version_v2.yaml
deleted file mode 100644
index c8bcf95c0567d..0000000000000
--- a/qa/cephfs/overrides/subvol_versions/create_subvol_version_v2.yaml
+++ /dev/null
@@ -1,2 +0,0 @@
-overrides:
-  subvolume_version: 2
diff --git a/qa/suites/fs/functional/subvol_versions/.qa b/qa/suites/fs/functional/subvol_versions/.qa
deleted file mode 120000
index fea2489fdf6d9..0000000000000
--- a/qa/suites/fs/functional/subvol_versions/.qa
+++ /dev/null
@@ -1 +0,0 @@
-../.qa
\ No newline at end of file
diff --git a/qa/suites/fs/functional/subvol_versions/create_subvol_version_v1.yaml b/qa/suites/fs/functional/subvol_versions/create_subvol_version_v1.yaml
deleted file mode 120000
index 09cfdb59edaed..0000000000000
--- a/qa/suites/fs/functional/subvol_versions/create_subvol_version_v1.yaml
+++ /dev/null
@@ -1 +0,0 @@
-.qa/cephfs/overrides/subvol_versions/create_subvol_version_v1.yaml
\ No newline at end of file
diff --git a/qa/suites/fs/functional/subvol_versions/create_subvol_version_v2.yaml b/qa/suites/fs/functional/subvol_versions/create_subvol_version_v2.yaml
deleted file mode 120000
index 5a4de14e7e008..0000000000000
--- a/qa/suites/fs/functional/subvol_versions/create_subvol_version_v2.yaml
+++ /dev/null
@@ -1 +0,0 @@
-.qa/cephfs/overrides/subvol_versions/create_subvol_version_v2.yaml
\ No newline at end of file
diff --git a/qa/suites/fs/functional/tasks/snap-schedule.yaml b/qa/suites/fs/functional/tasks/snap-schedule.yaml
deleted file mode 100644
index 7d7f62f16a881..0000000000000
--- a/qa/suites/fs/functional/tasks/snap-schedule.yaml
+++ /dev/null
@@ -1,23 +0,0 @@
-overrides:
-  ceph:
-    conf:
-      mgr:
-        debug mgr: 20
-        debug ms: 1
-        debug finisher: 20
-        debug client: 20
-    log-ignorelist:
-      - OSD full dropping all updates
-      - OSD near full
-      - pausewr flag
-      - failsafe engaged, dropping updates
-      - failsafe disengaged, no longer dropping
-      - is full \(reached quota
-      - POOL_FULL
-      - POOL_BACKFILLFULL
-      - cluster \[WRN\] evicting unresponsive client
-
-tasks:
-  - cephfs_test_runner:
-      modules:
-        - tasks.cephfs.test_snap_schedules
diff --git a/qa/suites/fs/functional/tasks/test_snap_schedule/% b/qa/suites/fs/functional/tasks/test_snap_schedule/%
new file mode 100644
index 0000000000000..e69de29bb2d1d
diff --git a/qa/suites/fs/functional/tasks/test_snap_schedule/overrides/$ b/qa/suites/fs/functional/tasks/test_snap_schedule/overrides/$
new file mode 100644
index 0000000000000..e69de29bb2d1d
diff --git a/qa/suites/fs/functional/tasks/test_snap_schedule/overrides/v1.yaml b/qa/suites/fs/functional/tasks/test_snap_schedule/overrides/v1.yaml
new file mode 100644
index 0000000000000..120b2bf04bee9
--- /dev/null
+++ b/qa/suites/fs/functional/tasks/test_snap_schedule/overrides/v1.yaml
@@ -0,0 +1,2 @@
+overrides:
+  subvolume_version: 1
diff --git a/qa/suites/fs/functional/tasks/test_snap_schedule/overrides/v2.yaml b/qa/suites/fs/functional/tasks/test_snap_schedule/overrides/v2.yaml
new file mode 100644
index 0000000000000..c8bcf95c0567d
--- /dev/null
+++ b/qa/suites/fs/functional/tasks/test_snap_schedule/overrides/v2.yaml
@@ -0,0 +1,2 @@
+overrides:
+  subvolume_version: 2
diff --git a/qa/suites/fs/functional/tasks/test_snap_schedule/snap-schedule.yaml b/qa/suites/fs/functional/tasks/test_snap_schedule/snap-schedule.yaml
new file mode 100644
index 0000000000000..7d7f62f16a881
--- /dev/null
+++ b/qa/suites/fs/functional/tasks/test_snap_schedule/snap-schedule.yaml
@@ -0,0 +1,23 @@
+overrides:
+  ceph:
+    conf:
+      mgr:
+        debug mgr: 20
+        debug ms: 1
+        debug finisher: 20
+        debug client: 20
+    log-ignorelist:
+      - OSD full dropping all updates
+      - OSD near full
+      - pausewr flag
+      - failsafe engaged, dropping updates
+      - failsafe disengaged, no longer dropping
+      - is full \(reached quota
+      - POOL_FULL
+      - POOL_BACKFILLFULL
+      - cluster \[WRN\] evicting unresponsive client
+
+tasks:
+  - cephfs_test_runner:
+      modules:
+        - tasks.cephfs.test_snap_schedules