summaryrefslogtreecommitdiff
path: root/qa
diff options
context:
space:
mode:
authorJosh Durgin <josh.durgin@inktank.com>2012-06-08 08:43:43 -0700
committerJosh Durgin <josh.durgin@inktank.com>2012-06-09 17:24:50 -0700
commit3d7925b1ae4db002b1b4c5a5ab403894f89dc54b (patch)
treeea01a5b723833c52ae85498af658c0795d9e72b9 /qa
parenta5026303f40e9ad05079ddcc75b30ac3066107fa (diff)
downloadceph-3d7925b1ae4db002b1b4c5a5ab403894f89dc54b.tar.gz
workunits/rbd: allow creating images in different formats
This will allow adding more arguments for testing combinations of features in the future. Signed-off-by: Josh Durgin <josh.durgin@inktank.com>
Diffstat (limited to 'qa')
-rwxr-xr-xqa/workunits/rbd/copy.sh2
-rwxr-xr-xqa/workunits/rbd/import_export.sh4
2 files changed, 3 insertions, 3 deletions
diff --git a/qa/workunits/rbd/copy.sh b/qa/workunits/rbd/copy.sh
index 5d922920ad9..933b735b786 100755
--- a/qa/workunits/rbd/copy.sh
+++ b/qa/workunits/rbd/copy.sh
@@ -17,7 +17,7 @@ dd if=/bin/ls of=/tmp/img1 bs=1k seek=10000
dd if=/bin/ln of=/tmp/img1 bs=1k seek=100000
# import, snapshot
-rbd import /tmp/img1 testimg1
+rbd import $RBD_CREATE_ARGS /tmp/img1 testimg1
rbd resize testimg1 --size=256
rbd export testimg1 /tmp/img2
rbd snap create testimg1 --snap=snap1
diff --git a/qa/workunits/rbd/import_export.sh b/qa/workunits/rbd/import_export.sh
index a2af194b43a..249ee448e3d 100755
--- a/qa/workunits/rbd/import_export.sh
+++ b/qa/workunits/rbd/import_export.sh
@@ -10,11 +10,11 @@ dd if=/bin/grep of=/tmp/img bs=1k seek=1000000
rbd rm testimg || true
-rbd import /tmp/img testimg
+rbd import $RBD_CREATE_ARGS /tmp/img testimg
rbd export testimg /tmp/img2
cmp /tmp/img /tmp/img2
rm /tmp/img /tmp/img2
-echo OK \ No newline at end of file
+echo OK