qa/suites: client-upgrade/jewel-client-x should test multiple features

Signed-off-by: Jason Dillaman <dillaman@redhat.com>

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 7ece9c1cf277a2de61fef059a4a7f370816440b9..4db664b29bc1a5e962c7519c88da518ebf2bd261 100644 (file)
--- 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 (file)
index 0000000..dff6623
--- /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 (file)
index 0000000..5613d01
--- /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/2-workload/rbd_notification_tests.yaml
deleted file mode 100644 (file)
index 1fb6822..0000000
--- a/qa/suites/upgrade/client-upgrade/jewel-client-x/rbd/2-workload/rbd_notification_tests.yaml
+++ /dev/null
@@ -1,21 +0,0 @@
-tasks:
-- workunit:
-    branch: jewel
-    clients:
-      client.0:
-        - rbd/notify_master.sh
-      client.1:
-        - rbd/notify_slave.sh
-    env:
-      RBD_FEATURES: "13"
-- print: "**** done rbd: old librbd -> new librbd"
-- workunit:
-    branch: jewel
-    clients:
-      client.0:
-        - rbd/notify_slave.sh
-      client.1:
-        - rbd/notify_master.sh
-    env:
-      RBD_FEATURES: "13"
-- print: "**** done rbd: new librbd -> old librbd"

diff --git a/qa/suites/upgrade/client-upgrade/jewel-client-x/rbd/3-workload/rbd_notification_tests.yaml b/qa/suites/upgrade/client-upgrade/jewel-client-x/rbd/3-workload/rbd_notification_tests.yaml
new file mode 100644 (file)
index 0000000..1fb6822
--- /dev/null
+++ b/qa/suites/upgrade/client-upgrade/jewel-client-x/rbd/3-workload/rbd_notification_tests.yaml
@@ -0,0 +1,21 @@
+tasks:
+- workunit:
+    branch: jewel
+    clients:
+      client.0:
+        - rbd/notify_master.sh
+      client.1:
+        - rbd/notify_slave.sh
+    env:
+      RBD_FEATURES: "13"
+- print: "**** done rbd: old librbd -> new librbd"
+- workunit:
+    branch: jewel
+    clients:
+      client.0:
+        - rbd/notify_slave.sh
+      client.1:
+        - rbd/notify_master.sh
+    env:
+      RBD_FEATURES: "13"
+- print: "**** done rbd: new librbd -> old librbd"