Differential D834

allow failure when uploading anaconda logs
ClosedPublic
Actions

Authored by adamwill on Apr 29 2016, 9:31 PM.

Details

Reviewers
garretraziel
jskladan
Commits
rOPENQATESTS9871c48433ca: allow failure when uploading anaconda logs
Summary

This requires a PR I sent upstream:
https://github.com/os-autoinst/os-autoinst/pull/490
This change is in os-autoinst -10. However, with older packages
it won't crash or anything, it'll just behave as before.

With the change, this allows log upload to fail, so if one of
the logs is missing, the hook doesn't immediately die and fail
to upload the rest of the logs. Various anaconda logs are not
always present: the DNF logs are not present for Atomic or live
installs, and the X.log and syslog are not present for live
installs. Adding a fail-tolerant mode to upstream upload_logs
seemed a better option than testing for the existence of each
log file prior to uploading it, or adding a bunch of GET_VAR
calls to try and figure out which log files 'should' exist.

Test Plan

Run an Atomic or live install test that fails, and
check what logs get uploaded. You can just test a current
Rawhide Atomic installer ISO, as they're crashing right now.
Without this patch (and the os-autoinst update) the hook dies
when it tries to upload dnf.log, so the traceback and /var/tmp
archive don't get uploaded; with this patch all the present
logs should get uploaded. Compare:
https://openqa.fedoraproject.org/tests/14834
https://openqa.stg.fedoraproject.org/tests/15371
(I tested this out on staging).

Diff Detail

Repository
rOPENQATESTS os-autoinst-distri-fedora
Lint
Automatic diff as part of commit; lint not applicable.
Unit
Automatic diff as part of commit; unit tests not applicable.
adamwill retitled this revision from to allow failure when uploading anaconda logs.Apr 29 2016, 9:31 PM
adamwill updated this object.
adamwill edited the test plan for this revision. (Show Details)
adamwill added reviewers: jskladan, garretraziel.
adamwill planned changes to this revision.May 2 2016, 7:05 AM

upstream want me to change this to a named arg, so this will need revising.

adamwill updated this revision to Diff 2139.May 4 2016, 1:38 AM

revise for version of the patch that got merged

the parameter is now named, in crazy perl style.

garretraziel accepted this revision.May 5 2016, 8:59 AM
garretraziel added inline comments.
lib/anacondatest.pm
23–32

Oh look how easy and predictable Perl-way of doing things and Perl syntax is.

This revision is now accepted and ready to land.May 5 2016, 8:59 AM
adamwill added inline comments.May 5 2016, 3:02 PM
lib/anacondatest.pm
23–32

well, it's *more or less* the same as passing an args dict to a Python function, to be fair.

Closed by commit rOPENQATESTS9871c48433ca: allow failure when uploading anaconda logs (authored by adamwill). · Explain WhyMay 6 2016, 8:44 PM
This revision was automatically updated to reflect the committed changes.

Revision Contents

PathPackages
Mlib/anacondatest.pm (20 lines)

Diff 2170

View Options

lib/anacondatest.pm

Show All 14 Lines11sub post_fail_hook {
15 my $has_traceback = 0; 15​ my $has_traceback = 0;
16 if (check_screen "anaconda_error", 10) { 16​ if (check_screen "anaconda_error", 10) {
17 assert_and_click "anaconda_error_report"; 17​ assert_and_click "anaconda_error_report";
18 $has_traceback = 1; 18​ $has_traceback = 1;
19 } 19​ }
20 20​
21 $self->root_console(check=>0); 21​ $self->root_console(check=>0);
22 if (check_screen "root_console", 10) { 22​ if (check_screen "root_console", 10) {
23 upload_logs "/tmp/X.log"; 23​ upload_logs "/tmp/X.log", failok=>1;
24 upload_logs "/tmp/anaconda.log"; 24​ upload_logs "/tmp/anaconda.log", failok=>1;
25 upload_logs "/tmp/packaging.log"; 25​ upload_logs "/tmp/packaging.log", failok=>1;
26 upload_logs "/tmp/storage.log"; 26​ upload_logs "/tmp/storage.log", failok=>1;
27 upload_logs "/tmp/syslog"; 27​ upload_logs "/tmp/syslog", failok=>1;
28 upload_logs "/tmp/program.log"; 28​ upload_logs "/tmp/program.log", failok=>1;
29 upload_logs "/tmp/dnf.log"; 29​ upload_logs "/tmp/dnf.log", failok=>1;
30 upload_logs "/tmp/dnf.librepo.log"; 30​ upload_logs "/tmp/dnf.librepo.log", failok=>1;
31 upload_logs "/tmp/dnf.rpm.log"; 31​ upload_logs "/tmp/dnf.rpm.log", failok=>1;
32 32​
garretrazielUnsubmitted
Not Done

Oh look how easy and predictable Perl-way of doing things and Perl syntax is.

adamwillAuthorUnsubmitted
Not Done

well, it's *more or less* the same as passing an args dict to a Python function, to be fair.

33 if ($has_traceback) { 33​ if ($has_traceback) {
34 # Upload Anaconda traceback logs 34​ # Upload Anaconda traceback logs
35 script_run "tar czf /tmp/anaconda_tb.tar.gz /tmp/anaconda-tb-*"; 35​ script_run "tar czf /tmp/anaconda_tb.tar.gz /tmp/anaconda-tb-*";
36 upload_logs "/tmp/anaconda_tb.tar.gz"; 36​ upload_logs "/tmp/anaconda_tb.tar.gz";
37 } 37​ }
38 38​
39 # Upload all ABRT logs 39​ # Upload all ABRT logs
40 script_run "tar czf /var/tmp/var_tmp.tar.gz /var/tmp"; 40​ script_run "tar czf /var/tmp/var_tmp.tar.gz /var/tmp";
41 upload_logs "/var/tmp/var_tmp.tar.gz"; 41​ upload_logs "/var/tmp/var_tmp.tar.gz";
42 42​
43 # Upload /var/log 43​ # Upload /var/log
44 script_run "tar czf /tmp/var_log.tar.gz /var/log"; 44​ script_run "tar czf /tmp/var_log.tar.gz /var/log";
45 upload_logs "/tmp/var_log.tar.gz"; 45​ upload_logs "/tmp/var_log.tar.gz";
46 46​
47 # Upload anaconda core dump, if there is one 47​ # Upload anaconda core dump, if there is one
48 script_run "ls /tmp/anaconda.core.* && tar czf /tmp/anaconda.core.tar.gz /tmp/anaconda.core.*"; 48​ script_run "ls /tmp/anaconda.core.* && tar czf /tmp/anaconda.core.tar.gz /tmp/anaconda.core.*";
49 upload_logs "/tmp/anaconda.core.tar.gz"; 49​ upload_logs "/tmp/anaconda.core.tar.gz", failok=>1;
50 } 50​ }
51 else { 51​ else {
52 save_screenshot; 52​ save_screenshot;
53 } 53​ }
54} 54​}
55 55​
56sub root_console { 56​sub root_console {
57 my $self = shift; 57​ my $self = shift;
▲ Show 20 Lines • Show All 90 Lines • Show Last 20 Lines