Skip to content

teuthology/task: use grep switch instead of egrep #2113

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
kshtsk merged 1 commit into from
Jan 24, 2026
Merged

teuthology/task: use grep switch instead of egrep #2113

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions teuthology/task/internal/syslog.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -106,7 +106,7 @@ def syslog(ctx, config):
log.debug('Checking %s', rem.name)
stdout = rem.sh(
[
'egrep', '--binary-files=text',
'grep', '-E', '--binary-files=text',
'\\bBUG\\b|\\bINFO\\b|\\bDEADLOCK\\b',
run.Raw(f'{archive_dir}/syslog/kern.log'),
run.Raw('|'),
Expand Down Expand Up @@ -143,11 +143,11 @@ def syslog(ctx, config):
run.Raw('|'),
'grep', '-v', 'container-storage-setup: INFO: Volume group backing root filesystem could not be determined', # noqa
run.Raw('|'),
'egrep', '-v', '\\bsalt-master\\b|\\bsalt-minion\\b|\\bsalt-api\\b',
'grep', '-E', '-v', '\\bsalt-master\\b|\\bsalt-minion\\b|\\bsalt-api\\b',
run.Raw('|'),
'grep', '-v', 'ceph-crash',
run.Raw('|'),
'egrep', '-v', '\\btcmu-runner\\b.*\\bINFO\\b',
'grep', '-E', '-v', '\\btcmu-runner\\b.*\\bINFO\\b',
run.Raw('|'),
'head', '-n', '1',
],
Expand Down
2 changes: 1 addition & 1 deletion teuthology/task/kernel.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -560,7 +560,7 @@ def install_and_reboot(ctx, need_install, config):
# complex this will totally break.

kernel_entries = role_remote.sh([
'egrep',
'grep', '-E',
'(submenu|menuentry.*' + kernel_title + ').*{',
'/boot/grub/grub.cfg'
]).split('\n')
Expand Down
Loading