Have domain controller upload logs *before* decommissioning

It transpires that decommissioning wipes some stuff, like the
dirsrv logs. Obviously we want these included in the logs we
upload for reference purposes, so let's upload earlier.

Signed-off-by: Adam Williamson <awilliam@redhat.com>
This commit is contained in:
Adam Williamson 2018-08-24 14:39:18 -07:00
parent 5d99d56f8d
commit cfe2a33038

View File

@ -23,6 +23,10 @@ sub run {
validate_script_output 'rolectl settings domaincontroller/domain.local', sub {$_ =~ m/dm_password = None/ }; validate_script_output 'rolectl settings domaincontroller/domain.local', sub {$_ =~ m/dm_password = None/ };
# once child jobs are done, stop the role # once child jobs are done, stop the role
wait_for_children; wait_for_children;
# run post-fail hook to upload logs - even when this test passes
# there are often cases where we need to see the logs (e.g. client
# test failed due to server issue)
$self->post_fail_hook();
assert_script_run 'rolectl stop domaincontroller/domain.local'; assert_script_run 'rolectl stop domaincontroller/domain.local';
# check role is stopped # check role is stopped
validate_script_output 'rolectl status domaincontroller/domain.local', sub { $_ =~ m/^ready-to-start/ }; validate_script_output 'rolectl status domaincontroller/domain.local', sub { $_ =~ m/^ready-to-start/ };
@ -34,6 +38,10 @@ sub run {
else { else {
# once child jobs are done, stop the server # once child jobs are done, stop the server
wait_for_children; wait_for_children;
# run post-fail hook to upload logs - even when this test passes
# there are often cases where we need to see the logs (e.g. client
# test failed due to server issue)
$self->post_fail_hook();
assert_script_run 'systemctl stop ipa.service'; assert_script_run 'systemctl stop ipa.service';
# check server is stopped # check server is stopped
assert_script_run '! systemctl is-active ipa.service'; assert_script_run '! systemctl is-active ipa.service';
@ -43,10 +51,6 @@ sub run {
assert_script_run 'clear'; assert_script_run 'clear';
# FIXME check server is decommissioned...how? # FIXME check server is decommissioned...how?
} }
# run post-fail hook to upload logs - even when this test passes
# there are often cases where we need to see the logs (e.g. client
# test failed due to server issue)
$self->post_fail_hook();
} }