upgrade/client-upgrade: only use supported features for RBD tests

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

diff --git a/suites/upgrade/client-upgrade/hammer-client-x/basic/2-workload/rbd_cli_import_export.yaml b/suites/upgrade/client-upgrade/hammer-client-x/basic/2-workload/rbd_cli_import_export.yaml
index ab83df856e1dbc76ff5ca0b2e3d2d2c519644916..dfaa0e8783d46dd4c0e74b71490d543ef2b7a239 100644 (file)
--- a/suites/upgrade/client-upgrade/hammer-client-x/basic/2-workload/rbd_cli_import_export.yaml
+++ b/suites/upgrade/client-upgrade/hammer-client-x/basic/2-workload/rbd_cli_import_export.yaml
@@ -9,5 +9,5 @@ tasks:
       client.0:
       - rbd/import_export.sh
     env:
-      RBD_CREATE_ARGS: --new-format
+      RBD_CREATE_ARGS: --image-feature layering,exclusive-lock,object-map
 - print: "**** done rbd/import_export.sh"

diff --git a/suites/upgrade/client-upgrade/hammer-client-x/rbd/0-cluster/start.yaml b/suites/upgrade/client-upgrade/hammer-client-x/rbd/0-cluster/start.yaml
index 0cdce9259e0e951b313777201b4c62695d510e9f..4d92f8005e8c65014839b9b8b73e67c132c6debf 100644 (file)
--- a/suites/upgrade/client-upgrade/hammer-client-x/rbd/0-cluster/start.yaml
+++ b/suites/upgrade/client-upgrade/hammer-client-x/rbd/0-cluster/start.yaml
@@ -11,3 +11,6 @@ overrides:
   ceph:
     log-whitelist:
     - failed to encode map
+    conf:
+      client:
+        rbd default features: 1

diff --git a/suites/upgrade/client-upgrade/infernalis-client-x/basic/2-workload/rbd_cli_import_export.yaml b/suites/upgrade/client-upgrade/infernalis-client-x/basic/2-workload/rbd_cli_import_export.yaml
index deb849af2d1f244a0b08456a9c80fdb744d901c3..5adc5ac40421a690168d4bf10a17652dbd955489 100644 (file)
--- a/suites/upgrade/client-upgrade/infernalis-client-x/basic/2-workload/rbd_cli_import_export.yaml
+++ b/suites/upgrade/client-upgrade/infernalis-client-x/basic/2-workload/rbd_cli_import_export.yaml
@@ -9,5 +9,5 @@ tasks:
       client.0:
       - rbd/import_export.sh
     env:
-      RBD_CREATE_ARGS: --new-format
+      RBD_CREATE_ARGS: --image-feature layering,exclusive-lock,object-map
 - print: "**** done rbd/import_export.sh"

diff --git a/suites/upgrade/client-upgrade/infernalis-client-x/rbd/0-cluster/start.yaml b/suites/upgrade/client-upgrade/infernalis-client-x/rbd/0-cluster/start.yaml
index 0cdce9259e0e951b313777201b4c62695d510e9f..4d92f8005e8c65014839b9b8b73e67c132c6debf 100644 (file)
--- a/suites/upgrade/client-upgrade/infernalis-client-x/rbd/0-cluster/start.yaml
+++ b/suites/upgrade/client-upgrade/infernalis-client-x/rbd/0-cluster/start.yaml
@@ -11,3 +11,6 @@ overrides:
   ceph:
     log-whitelist:
     - failed to encode map
+    conf:
+      client:
+        rbd default features: 1