From a9b7df2ebc7eca3fce1e3f05005fe44b04e9a159 Mon Sep 17 00:00:00 2001 From: Patrick Donnelly Date: Wed, 28 Oct 2020 20:14:19 -0700 Subject: [PATCH] qa: move multifs/failover tests Fixes: https://tracker.ceph.com/issues/23718 Signed-off-by: Patrick Donnelly --- qa/suites/fs/multifs/mount | 1 + qa/suites/fs/multifs/mount/.qa | 1 - qa/suites/fs/multifs/mount/fuse.yaml | 1 - qa/suites/fs/multifs/tasks/failover.yaml | 1 + qa/suites/kcephfs/multifs/% | 0 qa/suites/kcephfs/multifs/.qa | 1 - qa/suites/kcephfs/multifs/begin.yaml | 1 - .../kcephfs/multifs/clusters/2-mds-2-client.yaml | 14 -------------- qa/suites/kcephfs/multifs/conf | 1 - qa/suites/kcephfs/multifs/kclient | 1 - qa/suites/kcephfs/multifs/objectstore-ec | 1 - qa/suites/kcephfs/multifs/overrides/+ | 0 qa/suites/kcephfs/multifs/overrides/.qa | 1 - .../kcephfs/multifs/overrides/frag_enable.yaml | 1 - .../kcephfs/multifs/overrides/osd-asserts.yaml | 1 - .../multifs/overrides/whitelist_health.yaml | 1 - .../overrides/whitelist_wrongly_marked_down.yaml | 1 - qa/suites/kcephfs/multifs/tasks/multifs-auth.yaml | 4 ---- qa/suites/kcephfs/recovery/tasks/failover.yaml | 15 --------------- 19 files changed, 2 insertions(+), 45 deletions(-) create mode 120000 qa/suites/fs/multifs/mount delete mode 120000 qa/suites/fs/multifs/mount/.qa delete mode 120000 qa/suites/fs/multifs/mount/fuse.yaml delete mode 100644 qa/suites/kcephfs/multifs/% delete mode 120000 qa/suites/kcephfs/multifs/.qa delete mode 120000 qa/suites/kcephfs/multifs/begin.yaml delete mode 100644 qa/suites/kcephfs/multifs/clusters/2-mds-2-client.yaml delete mode 120000 qa/suites/kcephfs/multifs/conf delete mode 120000 qa/suites/kcephfs/multifs/kclient delete mode 120000 qa/suites/kcephfs/multifs/objectstore-ec delete mode 100644 qa/suites/kcephfs/multifs/overrides/+ delete mode 120000 qa/suites/kcephfs/multifs/overrides/.qa delete mode 120000 qa/suites/kcephfs/multifs/overrides/frag_enable.yaml delete mode 120000 qa/suites/kcephfs/multifs/overrides/osd-asserts.yaml delete mode 120000 qa/suites/kcephfs/multifs/overrides/whitelist_health.yaml delete mode 120000 qa/suites/kcephfs/multifs/overrides/whitelist_wrongly_marked_down.yaml delete mode 100644 qa/suites/kcephfs/multifs/tasks/multifs-auth.yaml delete mode 100644 qa/suites/kcephfs/recovery/tasks/failover.yaml diff --git a/qa/suites/fs/multifs/mount b/qa/suites/fs/multifs/mount new file mode 120000 index 00000000000..e3600f453f2 --- /dev/null +++ b/qa/suites/fs/multifs/mount @@ -0,0 +1 @@ +.qa/cephfs/mount/ \ No newline at end of file diff --git a/qa/suites/fs/multifs/mount/.qa b/qa/suites/fs/multifs/mount/.qa deleted file mode 120000 index a602a0353e7..00000000000 --- a/qa/suites/fs/multifs/mount/.qa +++ /dev/null @@ -1 +0,0 @@ -../.qa/ \ No newline at end of file diff --git a/qa/suites/fs/multifs/mount/fuse.yaml b/qa/suites/fs/multifs/mount/fuse.yaml deleted file mode 120000 index 0e55da9fb7a..00000000000 --- a/qa/suites/fs/multifs/mount/fuse.yaml +++ /dev/null @@ -1 +0,0 @@ -.qa/cephfs/mount/fuse.yaml \ No newline at end of file diff --git a/qa/suites/fs/multifs/tasks/failover.yaml b/qa/suites/fs/multifs/tasks/failover.yaml index 1425da72017..4a95f01da9c 100644 --- a/qa/suites/fs/multifs/tasks/failover.yaml +++ b/qa/suites/fs/multifs/tasks/failover.yaml @@ -12,6 +12,7 @@ tasks: mon.a: - ceph config set mgr mgr/crash/warn_recent_interval 0 - cephfs_test_runner: + fail_on_skip: false modules: - tasks.cephfs.test_failover diff --git a/qa/suites/kcephfs/multifs/% b/qa/suites/kcephfs/multifs/% deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/qa/suites/kcephfs/multifs/.qa b/qa/suites/kcephfs/multifs/.qa deleted file mode 120000 index fea2489fdf6..00000000000 --- a/qa/suites/kcephfs/multifs/.qa +++ /dev/null @@ -1 +0,0 @@ -../.qa \ No newline at end of file diff --git a/qa/suites/kcephfs/multifs/begin.yaml b/qa/suites/kcephfs/multifs/begin.yaml deleted file mode 120000 index 311d404f7c2..00000000000 --- a/qa/suites/kcephfs/multifs/begin.yaml +++ /dev/null @@ -1 +0,0 @@ -.qa/cephfs/begin.yaml \ No newline at end of file diff --git a/qa/suites/kcephfs/multifs/clusters/2-mds-2-client.yaml b/qa/suites/kcephfs/multifs/clusters/2-mds-2-client.yaml deleted file mode 100644 index 89c0d05e85c..00000000000 --- a/qa/suites/kcephfs/multifs/clusters/2-mds-2-client.yaml +++ /dev/null @@ -1,14 +0,0 @@ -roles: -- [mon.a, mgr.y, mds.a, mds.c, osd.0, osd.1, osd.2, osd.3] -- [mon.b, mon.c, mgr.x, mds.b, osd.4, osd.5, osd.6, osd.7] -- [client.0] -- [client.1] -openstack: -- volumes: # attached to each instance - count: 4 - size: 20 # GB -- machine: - disk: 200 # GB -log-rotate: - ceph-mds: 10G - ceph-osd: 10G diff --git a/qa/suites/kcephfs/multifs/conf b/qa/suites/kcephfs/multifs/conf deleted file mode 120000 index 6d47129847f..00000000000 --- a/qa/suites/kcephfs/multifs/conf +++ /dev/null @@ -1 +0,0 @@ -.qa/cephfs/conf/ \ No newline at end of file diff --git a/qa/suites/kcephfs/multifs/kclient b/qa/suites/kcephfs/multifs/kclient deleted file mode 120000 index 893d2d364eb..00000000000 --- a/qa/suites/kcephfs/multifs/kclient +++ /dev/null @@ -1 +0,0 @@ -.qa/cephfs/mount/kclient \ No newline at end of file diff --git a/qa/suites/kcephfs/multifs/objectstore-ec b/qa/suites/kcephfs/multifs/objectstore-ec deleted file mode 120000 index efca6130e8f..00000000000 --- a/qa/suites/kcephfs/multifs/objectstore-ec +++ /dev/null @@ -1 +0,0 @@ -.qa/cephfs/objectstore-ec/ \ No newline at end of file diff --git a/qa/suites/kcephfs/multifs/overrides/+ b/qa/suites/kcephfs/multifs/overrides/+ deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/qa/suites/kcephfs/multifs/overrides/.qa b/qa/suites/kcephfs/multifs/overrides/.qa deleted file mode 120000 index a602a0353e7..00000000000 --- a/qa/suites/kcephfs/multifs/overrides/.qa +++ /dev/null @@ -1 +0,0 @@ -../.qa/ \ No newline at end of file diff --git a/qa/suites/kcephfs/multifs/overrides/frag_enable.yaml b/qa/suites/kcephfs/multifs/overrides/frag_enable.yaml deleted file mode 120000 index 34a39a368cf..00000000000 --- a/qa/suites/kcephfs/multifs/overrides/frag_enable.yaml +++ /dev/null @@ -1 +0,0 @@ -.qa/cephfs/overrides/frag_enable.yaml \ No newline at end of file diff --git a/qa/suites/kcephfs/multifs/overrides/osd-asserts.yaml b/qa/suites/kcephfs/multifs/overrides/osd-asserts.yaml deleted file mode 120000 index f290c749bdc..00000000000 --- a/qa/suites/kcephfs/multifs/overrides/osd-asserts.yaml +++ /dev/null @@ -1 +0,0 @@ -.qa/cephfs/overrides/osd-asserts.yaml \ No newline at end of file diff --git a/qa/suites/kcephfs/multifs/overrides/whitelist_health.yaml b/qa/suites/kcephfs/multifs/overrides/whitelist_health.yaml deleted file mode 120000 index 74f39a49b27..00000000000 --- a/qa/suites/kcephfs/multifs/overrides/whitelist_health.yaml +++ /dev/null @@ -1 +0,0 @@ -.qa/cephfs/overrides/whitelist_health.yaml \ No newline at end of file diff --git a/qa/suites/kcephfs/multifs/overrides/whitelist_wrongly_marked_down.yaml b/qa/suites/kcephfs/multifs/overrides/whitelist_wrongly_marked_down.yaml deleted file mode 120000 index b4528c0f8c0..00000000000 --- a/qa/suites/kcephfs/multifs/overrides/whitelist_wrongly_marked_down.yaml +++ /dev/null @@ -1 +0,0 @@ -.qa/cephfs/overrides/whitelist_wrongly_marked_down.yaml \ No newline at end of file diff --git a/qa/suites/kcephfs/multifs/tasks/multifs-auth.yaml b/qa/suites/kcephfs/multifs/tasks/multifs-auth.yaml deleted file mode 100644 index 2825c7a6ff7..00000000000 --- a/qa/suites/kcephfs/multifs/tasks/multifs-auth.yaml +++ /dev/null @@ -1,4 +0,0 @@ -tasks: - - cephfs_test_runner: - modules: - - tasks.cephfs.test_multifs_auth diff --git a/qa/suites/kcephfs/recovery/tasks/failover.yaml b/qa/suites/kcephfs/recovery/tasks/failover.yaml deleted file mode 100644 index bc6e92aa58d..00000000000 --- a/qa/suites/kcephfs/recovery/tasks/failover.yaml +++ /dev/null @@ -1,15 +0,0 @@ -overrides: - ceph: - log-ignorelist: - - Replacing daemon mds - - \(MDS_INSUFFICIENT_STANDBY\) - - \(MDS_ALL_DOWN\) - - \(MDS_UP_LESS_THAN_MAX\) -tasks: - - exec: - mon.a: - - ceph config set mgr mgr/crash/warn_recent_interval 0 - - cephfs_test_runner: - fail_on_skip: false - modules: - - tasks.cephfs.test_failover -- 2.39.5