From f64cedf4dbb02bbf77558224f49935ab29f79106 Mon Sep 17 00:00:00 2001 From: Alex Elder Date: Mon, 10 Sep 2012 09:23:08 -0500 Subject: [PATCH] rbd: allow xfstests task to specify rbd image formats This adds the ability to specify the rbd image format to use for the scratch and test devices for the rbd.xfstests task. Signed-off-by: Alex Elder Reviewed-by: Dan Mick --- teuthology/task/rbd.py | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/teuthology/task/rbd.py b/teuthology/task/rbd.py index 86981dda90..625d623672 100644 --- a/teuthology/task/rbd.py +++ b/teuthology/task/rbd.py @@ -484,8 +484,10 @@ def xfstests(ctx, config): client.0: test_image: 'test_image' test_size: 250 + test_format: 2 scratch_image: 'scratch_image' scratch_size: 250 + scratch_format: 1 fs_type: 'xfs' tests: '1-9 11-15 17 19-21 26-28 31-34 41 45-48' """ @@ -515,17 +517,20 @@ def xfstests(ctx, config): test_image = properties.get('test_image', 'test_image') test_size = properties.get('test_size', 1000) + test_fmt = properties.get('test_format', 1) scratch_image = properties.get('scratch_image', 'scratch_image') scratch_size = properties.get('scratch_size', 1000) + scratch_fmt = properties.get('scratch_format', 1) test_image_config = {} test_image_config['image_name'] = test_image test_image_config['image_size'] = test_size + test_image_config['image_format'] = test_fmt scratch_image_config = {} scratch_image_config['image_name'] = scratch_image scratch_image_config['image_size'] = scratch_size - + scratch_image_config['image_format'] = scratch_fmt test_config = {} test_config['test_dev'] = \ -- 2.39.5