Merge "Replaced usage outdate egrep to grep"

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 }}'

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