From 4e54a9034c8ccee3f5283c079a0c32cf02282478 Mon Sep 17 00:00:00 2001 From: Kyr Shatskyy Date: Mon, 1 Jul 2024 14:18:54 +0200 Subject: qa: ceph.py mkfs.ext4 has no -f Addresses probable issue: mkfs.ext4: invalid option -- 'f' Fixes: https://tracker.ceph.com/issues/10797 Signed-off-by: Kyr Shatskyy --- qa/tasks/ceph.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'qa/tasks/ceph.py') diff --git a/qa/tasks/ceph.py b/qa/tasks/ceph.py index 6314183c3b3..706ea6b89f1 100644 --- a/qa/tasks/ceph.py +++ b/qa/tasks/ceph.py @@ -990,7 +990,9 @@ def cluster(ctx, config): try: remote.run(args=['yes', run.Raw('|')] + ['sudo'] + mkfs + [dev]) except run.CommandFailedError: - # Newer btfs-tools doesn't prompt for overwrite, use -f + if fs != 'btrfs': + raise + # Newer btrfs-tools doesn't prompt for overwrite, use -f if '-f' not in mount_options: mkfs_options.append('-f') mkfs = ['mkfs.%s' % fs] + mkfs_options -- cgit v1.2.3