diff --git a/lib/OpenQA/Schema/Result/Jobs.pm b/lib/OpenQA/Schema/Result/Jobs.pm index 258da35cee5..72411173e35 100644 --- a/lib/OpenQA/Schema/Result/Jobs.pm +++ b/lib/OpenQA/Schema/Result/Jobs.pm @@ -1819,7 +1819,7 @@ sub test_resultfile_list ($self) { for my $f (@filelist) { push(@$filelist_existing, $f) if -e "$testresdir/$f"; } - for my $f (qw(serial_terminal.txt serial_terminal_user.txt)) { + for my $f (qw(serial_terminal.txt serial_terminal_user.txt ipmisol-serial.txt)) { push(@$filelist_existing, $f) if -s "$testresdir/$f"; } diff --git a/lib/OpenQA/Worker/Job.pm b/lib/OpenQA/Worker/Job.pm index 0d2411d8320..db573b811f7 100644 --- a/lib/OpenQA/Worker/Job.pm +++ b/lib/OpenQA/Worker/Job.pm @@ -260,7 +260,7 @@ sub start { # ensure log files are empty/removed if (my $pooldir = $worker->pool_directory) { open(my $fd, '>', "$pooldir/worker-log.txt") or log_error("Could not open worker log: $!"); - foreach my $file (qw(serial0.txt autoinst-log.txt serial_terminal.txt)) { + foreach my $file (qw(serial0.txt autoinst-log.txt serial_terminal.txt ipmisol-serial)) { next unless -e "$pooldir/$file"; unlink("$pooldir/$file") or log_error("Could not unlink '$file': $!"); } @@ -449,12 +449,12 @@ sub _stop_step_4_upload ($self, $reason, $callback) { } my @other = ( + qw(serial0 video_time.vtt serial_terminal.txt ipmisol-serial virtio_console.log virtio_console1.log virtio_console_user.log), @{find_video_files($pooldir)->map('basename')->to_array}, - COMMON_RESULT_FILES, + COMMON_RESULT_FILES # NOTE: serial_terminal.txt is from svirt backend. But also # virtio_console.log from qemu backend is renamed to # serial_terminal.txt below. - qw(serial0 video_time.vtt serial_terminal.txt virtio_console.log virtio_console1.log virtio_console_user.log) ); for my $other (@other) { my $file = "$pooldir/$other"; @@ -463,6 +463,7 @@ sub _stop_step_4_upload ($self, $reason, $callback) { # replace some file names my $ofile = $file; + $ofile =~ s/ipmisol-serial/ipmisol-serial.txt/; $ofile =~ s/serial0/serial0.txt/; $ofile =~ s/virtio_console(.*)\.log/serial_terminal$1.txt/; $ofile =~ s/\.log/.txt/;