qa: switch to use merge fragment to filter the kclient

The mds_upgrade_sequence tests aim to test the ceph cluster upgrading, and it doesn't matter about the clients. And keep using the kclient to run the tests as it was. Fixes: https://tracker.ceph.com/issues/59197 Signed-off-by: Xiubo Li <xiubli@redhat.com>
ceph · Oct 26, 2023 · c5afa6a · c5afa6a
1 parent 54fea2e
commit c5afa6a
Show file tree

Hide file tree

Showing 21 changed files with 5 additions and 3 deletions.
diff --git a/qa/suites/fs/upgrade/mds_upgrade_sequence/tasks/1-mount b/qa/suites/fs/upgrade/mds_upgrade_sequence/tasks/1-mount
@@ -0,0 +1 @@
+.qa/cephfs/mount/
diff --git a/qa/suites/fs/upgrade/mds_upgrade_sequence/tasks/2-client.yaml b/qa/suites/fs/upgrade/mds_upgrade_sequence/tasks/2-client.yaml
diff --git a/...ade/mds_upgrade_sequence/tasks/1-volume/% → ...ade/mds_upgrade_sequence/tasks/2-volume/% b/...ade/mds_upgrade_sequence/tasks/1-volume/% → ...ade/mds_upgrade_sequence/tasks/2-volume/%
diff --git a/...e/mds_upgrade_sequence/tasks/1-volume/.qa → ...e/mds_upgrade_sequence/tasks/2-volume/.qa b/...e/mds_upgrade_sequence/tasks/1-volume/.qa → ...e/mds_upgrade_sequence/tasks/2-volume/.qa
diff --git a/...ade_sequence/tasks/1-volume/0-create.yaml → ...ade_sequence/tasks/2-volume/0-create.yaml b/...ade_sequence/tasks/1-volume/0-create.yaml → ...ade_sequence/tasks/2-volume/0-create.yaml
diff --git a/...grade_sequence/tasks/1-volume/1-ranks/.qa → ...grade_sequence/tasks/2-volume/1-ranks/.qa b/...grade_sequence/tasks/1-volume/1-ranks/.qa → ...grade_sequence/tasks/2-volume/1-ranks/.qa
diff --git a/...de_sequence/tasks/1-volume/1-ranks/1.yaml → ...de_sequence/tasks/2-volume/1-ranks/1.yaml b/...de_sequence/tasks/1-volume/1-ranks/1.yaml → ...de_sequence/tasks/2-volume/1-ranks/1.yaml
diff --git a/...de_sequence/tasks/1-volume/1-ranks/2.yaml → ...de_sequence/tasks/2-volume/1-ranks/2.yaml b/...de_sequence/tasks/1-volume/1-ranks/2.yaml → ...de_sequence/tasks/2-volume/1-ranks/2.yaml
diff --git a/...tasks/1-volume/2-allow_standby_replay/.qa → ...tasks/2-volume/2-allow_standby_replay/.qa b/...tasks/1-volume/2-allow_standby_replay/.qa → ...tasks/2-volume/2-allow_standby_replay/.qa
diff --git a/...s/1-volume/2-allow_standby_replay/no.yaml → ...s/2-volume/2-allow_standby_replay/no.yaml b/...s/1-volume/2-allow_standby_replay/no.yaml → ...s/2-volume/2-allow_standby_replay/no.yaml
diff --git a/.../1-volume/2-allow_standby_replay/yes.yaml → .../2-volume/2-allow_standby_replay/yes.yaml b/.../1-volume/2-allow_standby_replay/yes.yaml → .../2-volume/2-allow_standby_replay/yes.yaml
diff --git a/...rade_sequence/tasks/1-volume/3-inline/.qa → ...rade_sequence/tasks/2-volume/3-inline/.qa b/...rade_sequence/tasks/1-volume/3-inline/.qa → ...rade_sequence/tasks/2-volume/3-inline/.qa
diff --git a/..._sequence/tasks/1-volume/3-inline/no.yaml → ..._sequence/tasks/2-volume/3-inline/no.yaml b/..._sequence/tasks/1-volume/3-inline/no.yaml → ..._sequence/tasks/2-volume/3-inline/no.yaml
diff --git a/...sequence/tasks/1-volume/3-inline/yes.yaml → ...sequence/tasks/2-volume/3-inline/yes.yaml b/...sequence/tasks/1-volume/3-inline/yes.yaml → ...sequence/tasks/2-volume/3-inline/yes.yaml
diff --git a/...ade_sequence/tasks/1-volume/4-verify.yaml → ...ade_sequence/tasks/2-volume/4-verify.yaml b/...ade_sequence/tasks/1-volume/4-verify.yaml → ...ade_sequence/tasks/2-volume/4-verify.yaml
diff --git a/qa/suites/fs/upgrade/mds_upgrade_sequence/tasks/3-client.yaml b/qa/suites/fs/upgrade/mds_upgrade_sequence/tasks/3-client.yaml
@@ -0,0 +1,4 @@
+teuthology:
+  postmerge:
+    - if is_fuse() then reject() end
+tasks:
diff --git a/...quence/tasks/3-upgrade-mgr-staggered.yaml → ...quence/tasks/4-upgrade-mgr-staggered.yaml b/...quence/tasks/3-upgrade-mgr-staggered.yaml → ...quence/tasks/4-upgrade-mgr-staggered.yaml
diff --git a/...upgrade_sequence/tasks/4-config-upgrade/+ → ...upgrade_sequence/tasks/5-config-upgrade/+ b/...upgrade_sequence/tasks/4-config-upgrade/+ → ...upgrade_sequence/tasks/5-config-upgrade/+
diff --git a/...uence/tasks/4-config-upgrade/fail_fs.yaml → ...uence/tasks/5-config-upgrade/fail_fs.yaml b/...uence/tasks/4-config-upgrade/fail_fs.yaml → ...uence/tasks/5-config-upgrade/fail_fs.yaml
diff --git a/...quence/tasks/5-upgrade-with-workload.yaml → ...quence/tasks/6-upgrade-with-workload.yaml b/...quence/tasks/5-upgrade-with-workload.yaml → ...quence/tasks/6-upgrade-with-workload.yaml
diff --git a/.../mds_upgrade_sequence/tasks/6-verify.yaml → .../mds_upgrade_sequence/tasks/7-verify.yaml b/.../mds_upgrade_sequence/tasks/6-verify.yaml → .../mds_upgrade_sequence/tasks/7-verify.yaml