add gating up/down script for devstack
This adds the test infrastructure for testing that unstack.sh and
clean.sh do the right thing, and actually stop what's expected. This
is designed to be used in upstream testing to make unstack and clean a
bit more certain.
It includes numerous fixes to make these pass in an errexit
environment with the gate config. The scripts still don't run under
errexit because we don't assume we've handled all possible cleanup safely.
Change-Id: I774dfb2cc934367eef2bb7ea5123197f6da7565b
diff --git a/lib/databases/mysql b/lib/databases/mysql
index 72c0f82..c8ceec2 100644
--- a/lib/databases/mysql
+++ b/lib/databases/mysql
@@ -28,17 +28,14 @@
stop_service $MYSQL
if is_ubuntu; then
# Get ruthless with mysql
- stop_service $MYSQL
apt_get purge -y mysql* mariadb*
sudo rm -rf /var/lib/mysql
sudo rm -rf /etc/mysql
return
elif is_fedora; then
- stop_service mariadb
uninstall_package mariadb-server
sudo rm -rf /var/lib/mysql
elif is_suse; then
- stop_service mysql
uninstall_package mysql-community-server
sudo rm -rf /var/lib/mysql
else
diff --git a/lib/dstat b/lib/dstat
index 8165e5c..740e48f 100644
--- a/lib/dstat
+++ b/lib/dstat
@@ -40,7 +40,10 @@
# stop_dstat() stop dstat process
function stop_dstat {
- screen_stop dstat
+ # dstat runs as a console, not as a service, and isn't trackable
+ # via the normal mechanisms for devstack. So lets just do a
+ # killall and move on.
+ killall dstat || /bin/true
}
# Restore xtrace
diff --git a/lib/rpc_backend b/lib/rpc_backend
index 981b80b..ec821f1 100644
--- a/lib/rpc_backend
+++ b/lib/rpc_backend
@@ -74,7 +74,8 @@
if is_service_enabled rabbit; then
# Obliterate rabbitmq-server
uninstall_package rabbitmq-server
- sudo killall epmd || sudo killall -9 epmd
+ # in case it's not actually running, /bin/true at the end
+ sudo killall epmd || sudo killall -9 epmd || /bin/true
if is_ubuntu; then
# And the Erlang runtime too
apt_get purge -y erlang*
diff --git a/lib/sahara b/lib/sahara
index 995935a..5720c20 100644
--- a/lib/sahara
+++ b/lib/sahara
@@ -184,7 +184,7 @@
# stop_sahara() - Stop running processes
function stop_sahara {
# Kill the Sahara screen windows
- screen -S $SCREEN_NAME -p sahara -X kill
+ stop_process sahara
}