From: Jason Dillaman <dillaman@redhat.com>
Date: Thu, 26 Feb 2015 17:00:41 +0000 (-0500)
Subject: qa/workunits/rbd/copy.sh: explicitly choose the image format
X-Git-Tag: v0.93~2^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=refs%2Fpull%2F3806%2Fhead;p=ceph.git

qa/workunits/rbd/copy.sh: explicitly choose the image format

The rbd CLI now utilizes the rbd_default_format configuration
setting, therefore the copy test now needs to tell rbd which image
format it is expecting to create.

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

diff --git a/qa/workunits/rbd/copy.sh b/qa/workunits/rbd/copy.sh
index 27a1789c07a..4aec5ab780f 100755
--- a/qa/workunits/rbd/copy.sh
+++ b/qa/workunits/rbd/copy.sh
@@ -108,8 +108,8 @@ test_ls() {
     echo "testing ls..."
     remove_images
 
-    rbd create -s 1 test1
-    rbd create -s 1 test2
+    rbd create --image-format 1 -s 1 test1
+    rbd create --image-format 1 -s 1 test2
     rbd ls | grep test1
     rbd ls | grep test2
     rbd ls | wc -l | grep 2
@@ -120,8 +120,8 @@ test_ls() {
     rbd rm test1
     rbd rm test2
 
-    rbd create --new-format -s 1 test1
-    rbd create --new-format -s 1 test2
+    rbd create --image-format 2 -s 1 test1
+    rbd create --image-format 2 -s 1 test2
     rbd ls | grep test1
     rbd ls | grep test2
     rbd ls | wc -l | grep 2
@@ -132,7 +132,7 @@ test_ls() {
     rbd rm test2
 
     rbd create --new-format -s 1 test1
-    rbd create -s 1 test2
+    rbd create --image-format 1 -s 1 test2
     rbd ls | grep test1
     rbd ls | grep test2
     rbd ls | wc -l | grep 2
@@ -177,7 +177,7 @@ test_remove() {
     # by removing some objects manually.
 
     # remove with header missing (old format)
-    rbd create -s 1 test1
+    rbd create --image-format 1 -s 1 test1
     rados rm -p rbd test1.rbd
     rbd rm test1
     rbd ls | wc -l | grep "^0$"