librbd/qa: Permit V1 images in qa tests

Signed-off-by: Julien COLLET <julien.collet@cern.ch>

diff --git a/qa/tasks/rbd.py b/qa/tasks/rbd.py
index e6701aff94c509488a3788d6716b4301f46470e1..193ab1c3961a0dfaa2b30076dc074806e7bc6173 100644 (file)
--- a/qa/tasks/rbd.py
+++ b/qa/tasks/rbd.py
@@ -16,6 +16,9 @@ from teuthology.task.common_fs_utils import generic_mkfs
 from teuthology.task.common_fs_utils import generic_mount
 from teuthology.task.common_fs_utils import default_image_name
 
+#V1 image unsupported but required for testing purposes
+os.environ["RBD_FORCE_ALLOW_V1"] = "1"
+
 log = logging.getLogger(__name__)
 
 @contextlib.contextmanager

diff --git a/qa/workunits/rbd/import_export.sh b/qa/workunits/rbd/import_export.sh
index deb28051413bc49b90b4d6068648e6b31e97e1b8..57e0595343a17def22366a94a03399c9cca6d6df 100755 (executable)
--- a/qa/workunits/rbd/import_export.sh
+++ b/qa/workunits/rbd/import_export.sh
@@ -1,5 +1,8 @@
 #!/bin/sh -ex
 
+# V1 image unsupported but required for testing purposes
+export RBD_FORCE_ALLOW_V1=1
+
 # returns data pool for a given image
 get_image_data_pool () {
     image=$1