From: Jason Dillaman Date: Fri, 20 Apr 2018 15:31:27 +0000 (-0400) Subject: qa/workunits/rbd/import_export: update unit formatting X-Git-Tag: v12.2.6~135^2 X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=ff61e25a260b9a856e6eab65d783f603d444aef2;p=ceph.git qa/workunits/rbd/import_export: update unit formatting 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 --- diff --git a/qa/workunits/rbd/import_export.sh b/qa/workunits/rbd/import_export.sh index c9ecb8b62523..b656a8970efd 100755 --- a/qa/workunits/rbd/import_export.sh +++ b/qa/workunits/rbd/import_export.sh @@ -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