From: Julien COLLET <julien.collet@cern.ch>
Date: Wed, 14 Mar 2018 07:46:27 +0000 (+0100)
Subject: librbd/qa: Permit V1 images in qa tests
X-Git-Tag: v13.1.0~422^2~1
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=386b752e62cd04070566a5d7b174526dd65aa107;p=ceph.git

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 e6701aff94c5..193ab1c3961a 100644
--- 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 deb28051413b..57e0595343a1 100755
--- 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