From 6dfb84e8246d625642fd751c63a3954fdd36cf88 Mon Sep 17 00:00:00 2001 From: Nitzan Mordechai Date: Sun, 26 Oct 2025 12:00:19 +0000 Subject: [PATCH] qa/tasks: update egrep to 'grep -E' egrep marked as obsolete, update it to grep -E Signed-off-by: Nitzan Mordechai Signed-off-by: Samuel Just --- qa/tasks/ceph.py | 6 +++--- qa/tasks/cephadm.py | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/qa/tasks/ceph.py b/qa/tasks/ceph.py index ea860a135f99..171e0b52a2c4 100644 --- a/qa/tasks/ceph.py +++ b/qa/tasks/ceph.py @@ -1200,11 +1200,11 @@ def cluster(ctx, config): """ args = [ 'sudo', - 'egrep', pattern, + 'grep', '-E', pattern, '/var/log/ceph/{cluster}.log'.format(cluster=cluster_name), ] for exclude in excludes: - args.extend([run.Raw('|'), 'egrep', '-v', exclude]) + args.extend([run.Raw('|'), 'grep', '-E', '-v', exclude]) args.extend([ run.Raw('|'), 'head', '-n', '1', ]) @@ -1682,7 +1682,7 @@ def restart(ctx, config): cluster, type_, id_ = teuthology.split_role(role) remote.run( args = ['sudo', - 'egrep', expected_fail, + 'grep', '-E', expected_fail, '/var/log/ceph/{cluster}-{type_}.{id_}.log'.format(cluster=cluster, type_=type_, id_=id_), ]) yield diff --git a/qa/tasks/cephadm.py b/qa/tasks/cephadm.py index 5d48c904e619..caa381cc71df 100644 --- a/qa/tasks/cephadm.py +++ b/qa/tasks/cephadm.py @@ -393,15 +393,15 @@ def ceph_log(ctx, config): """ args = [ 'sudo', - 'egrep', pattern, + 'grep', '-E', pattern, '/var/log/ceph/{fsid}/ceph.log'.format( fsid=fsid), ] if only_match: - args.extend([run.Raw('|'), 'egrep', '|'.join(only_match)]) + args.extend([run.Raw('|'), 'grep', '-E', '|'.join(only_match)]) if excludes: for exclude in excludes: - args.extend([run.Raw('|'), 'egrep', '-v', exclude]) + args.extend([run.Raw('|'), 'grep', '-E', '-v', exclude]) args.extend([ run.Raw('|'), 'head', '-n', '1', ]) -- 2.47.3