From 7ab93b7779b293ceda325a6d1cdb446cf624a6e3 Mon Sep 17 00:00:00 2001 From: Jason Dillaman Date: Wed, 19 Apr 2017 09:12:04 -0400 Subject: [PATCH] qa/suites: client-upgrade/jewel-client-x should test multiple features Signed-off-by: Jason Dillaman --- .../client-upgrade/jewel-client-x/rbd/0-cluster/start.yaml | 4 ---- .../jewel-client-x/rbd/2-features/defaults.yaml | 6 ++++++ .../jewel-client-x/rbd/2-features/layering.yaml | 6 ++++++ .../{2-workload => 3-workload}/rbd_notification_tests.yaml | 0 4 files changed, 12 insertions(+), 4 deletions(-) create mode 100644 qa/suites/upgrade/client-upgrade/jewel-client-x/rbd/2-features/defaults.yaml create mode 100644 qa/suites/upgrade/client-upgrade/jewel-client-x/rbd/2-features/layering.yaml rename qa/suites/upgrade/client-upgrade/jewel-client-x/rbd/{2-workload => 3-workload}/rbd_notification_tests.yaml (100%) diff --git a/qa/suites/upgrade/client-upgrade/jewel-client-x/rbd/0-cluster/start.yaml b/qa/suites/upgrade/client-upgrade/jewel-client-x/rbd/0-cluster/start.yaml index 7ece9c1cf27..4db664b29bc 100644 --- a/qa/suites/upgrade/client-upgrade/jewel-client-x/rbd/0-cluster/start.yaml +++ b/qa/suites/upgrade/client-upgrade/jewel-client-x/rbd/0-cluster/start.yaml @@ -12,7 +12,3 @@ overrides: log-whitelist: - failed to encode map fs: xfs - conf: - client: - rbd default features: 1 - diff --git a/qa/suites/upgrade/client-upgrade/jewel-client-x/rbd/2-features/defaults.yaml b/qa/suites/upgrade/client-upgrade/jewel-client-x/rbd/2-features/defaults.yaml new file mode 100644 index 00000000000..dff6623ad03 --- /dev/null +++ b/qa/suites/upgrade/client-upgrade/jewel-client-x/rbd/2-features/defaults.yaml @@ -0,0 +1,6 @@ +overrides: + ceph: + conf: + client: + rbd default features: 61 + diff --git a/qa/suites/upgrade/client-upgrade/jewel-client-x/rbd/2-features/layering.yaml b/qa/suites/upgrade/client-upgrade/jewel-client-x/rbd/2-features/layering.yaml new file mode 100644 index 00000000000..5613d0155ab --- /dev/null +++ b/qa/suites/upgrade/client-upgrade/jewel-client-x/rbd/2-features/layering.yaml @@ -0,0 +1,6 @@ +overrides: + ceph: + conf: + client: + rbd default features: 1 + diff --git a/qa/suites/upgrade/client-upgrade/jewel-client-x/rbd/2-workload/rbd_notification_tests.yaml b/qa/suites/upgrade/client-upgrade/jewel-client-x/rbd/3-workload/rbd_notification_tests.yaml similarity index 100% rename from qa/suites/upgrade/client-upgrade/jewel-client-x/rbd/2-workload/rbd_notification_tests.yaml rename to qa/suites/upgrade/client-upgrade/jewel-client-x/rbd/3-workload/rbd_notification_tests.yaml -- 2.39.5