openstack/glance
Code Issues Proposed changes

Merge "Replaced usage outdate egrep to grep"

Browse Source
This commit is contained in:
Zuul
2025-08-26 16:13:44 +00:00
committed by Gerrit Code Review
parent b5df1066f2 4bc50f7a2d
commit 6c33a667a9
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
playbooks/post-check-metadata-injection.yaml
View File

@@ -19,6 +19,6 @@
glance image-list --property-filter 'glance_devstack_test=doyouseeme?' | grep $image glance image-list --property-filter 'glance_devstack_test=doyouseeme?' | grep $image
echo "Checking that the cirros image was converted to raw on import..." 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 done
environment: '{{ zuul | zuul_legacy_vars }}' environment: '{{ zuul | zuul_legacy_vars }}'

2
tools/test-setup.sh
View File

@@ -25,7 +25,7 @@ function set_conf_line {
echo '$3' >> $1" 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 # mysql needs to be started on centos/rhel
sudo systemctl restart mariadb.service sudo systemctl restart mariadb.service