qa/tasks: update egrep to 'grep -E'

egrep marked as obsolete, update it to grep -E

Signed-off-by: Nitzan Mordechai <nmordech@ibm.com>
Signed-off-by: Samuel Just <sjust@redhat.com>

diff --git a/qa/tasks/ceph.py b/qa/tasks/ceph.py
index ea860a135f9911c6f40188cdf4a7afee0889dc21..171e0b52a2c4df853d21ca3fe1b65510b29ca243 100644 (file)
--- 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 5d48c904e619c64c314c3b82037999acc6bebfef..caa381cc71df044197c96bb08a0c32e9608b8677 100644 (file)
--- 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',
             ])