Merge "Replaced usage outdate egrep to grep"

Zuul · openstack-gerrit · commit 6c33a667a9f5 · 2025-08-26T16:13:44.000Z
diff --git a/playbooks/post-check-metadata-injection.yaml b/playbooks/post-check-metadata-injection.yaml
@@ -19,6 +19,6 @@
               glance image-list --property-filter 'glance_devstack_test=doyouseeme?' | grep $image
 
               echo "Checking that the cirros image was converted to raw on import..."
-              glance image-show $image | egrep -e 'disk_format.*raw'
+              glance image-show $image | grep 'disk_format.*raw'
           done
       environment: '{{ zuul | zuul_legacy_vars }}'
diff --git a/tools/test-setup.sh b/tools/test-setup.sh
@@ -25,7 +25,7 @@ function set_conf_line {
             echo '$3' >> $1"
 }
 
-if $(egrep -q "^.*(centos:centos:|cloudlinux:cloudlinux:|redhat:enterprise_linux:)[78].*$" /etc/*release); then
+if $(grep -Eq "^.*(centos:centos:|cloudlinux:cloudlinux:|redhat:enterprise_linux:)[78].*$" /etc/*release); then
     # mysql needs to be started on centos/rhel
     sudo systemctl restart mariadb.service
 

Original file line number	Diff line number	Diff line change
`@@ -25,7 +25,7 @@ function set_conf_line {`
`25`	`25`	`echo '$3' >> $1"`
`26`	`26`	`}`
`27`	`27`
`28`		`-if $(egrep -q "^.(centos:centos:\|cloudlinux:cloudlinux:\|redhat:enterprise_linux:)[78].$" /etc/*release); then`
	`28`	`+if $(grep -Eq "^.(centos:centos:\|cloudlinux:cloudlinux:\|redhat:enterprise_linux:)[78].$" /etc/*release); then`
`29`	`29`	`# mysql needs to be started on centos/rhel`
`30`	`30`	`sudo systemctl restart mariadb.service`
`31`	`31`