Merge "fix(rally): update cleanup"

This commit is contained in:
Zuul 2020-05-20 15:13:13 +00:00 committed by Gerrit Code Review
commit 6fb854af37
2 changed files with 4 additions and 4 deletions

View File

@ -793,11 +793,11 @@ conf:
force_project_purge: false
run_tempest: false
clean_up: |
ROUTERS=$(openstack router list -f value | grep -e "^[sc]_rally_" | awk '{ print $1 }')
ROUTERS=$(openstack router list -f value | awk '$2 ~ /^[sc]_rally_/ { print $1 }')
if [ -n "$ROUTERS" ]; then
echo $ROUTERS | xargs openstack router delete
fi
NETWORKS=$(openstack network list -f value | grep -e "^[sc]_rally_" | awk '{ print $1 }')
NETWORKS=$(openstack network list -f value | awk '$2 ~ /^[sc]_rally_/ { print $1 }')
if [ -n "$NETWORKS" ]; then
echo $NETWORKS | xargs openstack network delete
fi

View File

@ -617,11 +617,11 @@ conf:
rally_tests:
run_tempest: false
clean_up: |
FLAVORS=$(openstack flavor list -f value | grep -e "^s_rally_" | awk '{ print $1 }')
FLAVORS=$(openstack flavor list -f value --all | awk '$2 ~ /^s_rally_/ { print $1 }')
if [ -n "$FLAVORS" ]; then
echo $FLAVORS | xargs openstack flavor delete
fi
SERVERS=$(openstack server list -f value | grep -e "^s_rally_" | awk '{ print $1 }')
SERVERS=$(openstack server list -f value --all | awk '$2 ~ /^s_rally_/ { print $1 }')
if [ -n "$SERVERS" ]; then
echo $SERVERS | xargs openstack server delete
fi