From: Jason Dillaman <dillaman@redhat.com>
Date: Wed, 19 Apr 2017 13:12:04 +0000 (-0400)
Subject: qa/suites: client-upgrade/jewel-client-x should test multiple features
X-Git-Tag: v12.0.2~3^2~1
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=7ab93b7779b293ceda325a6d1cdb446cf624a6e3;p=ceph.git

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 7ece9c1cf277..4db664b29bc1 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 000000000000..dff6623ad03d
--- /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 000000000000..5613d0155abc
--- /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
index 1fb68220e9de..000000000000
--- 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
index 000000000000..1fb68220e9de
--- /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"