]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
qa/workunits/rbd/import_export: update unit formatting 21944/head
authorJason Dillaman <dillaman@redhat.com>
Fri, 20 Apr 2018 15:31:27 +0000 (11:31 -0400)
committerJason Dillaman <dillaman@redhat.com>
Fri, 11 May 2018 14:28:19 +0000 (10:28 -0400)
Mimic changed the unit formating output for rbd CLI commands, so
for upgrade tests we need to support both Luminous and Mimic style.

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
qa/workunits/rbd/import_export.sh

index c9ecb8b62523b6d609dba3efef305613af989ab3..b656a8970efdd0ac91cb7688a3f7d204b5e8db64 100755 (executable)
@@ -132,7 +132,7 @@ if rbd help export | grep -q export-format; then
     rbd import --stripe-count 1000 --stripe-unit 4096 ${TMPDIR}/img testimg
     rbd export --export-format 2 testimg ${TMPDIR}/img_v2
     rbd import --export-format 2 ${TMPDIR}/img_v2 testimg_import
-    rbd info testimg_import|grep "stripe unit"|awk '{print $3}'|grep 4096
+    rbd info testimg_import|grep "stripe unit"|awk '{print $3}'|grep -Ei '(4K|4096)'
     rbd info testimg_import|grep "stripe count"|awk '{print $3}'|grep 1000
 
     rm ${TMPDIR}/img_v2