[tools 3/3] testbot/WineSendLog: Don't include the test logs in the job report.

Francois Gouget fgouget at codeweavers.com
Mon Jun 13 10:20:46 CDT 2022


The logs can be pretty big, causing the email to exceed typical email
size limits and cause bounces. The logs can be downloaded from the
website anyway.

Signed-off-by: Francois Gouget <fgouget at codeweavers.com>
---
 testbot/bin/WineSendLog.pl | 47 +++-----------------------------------
 1 file changed, 3 insertions(+), 44 deletions(-)

diff --git a/testbot/bin/WineSendLog.pl b/testbot/bin/WineSendLog.pl
index 8e2048e23..9351d5d6f 100755
--- a/testbot/bin/WineSendLog.pl
+++ b/testbot/bin/WineSendLog.pl
@@ -51,9 +51,6 @@ use WineTestBot::StepsTasks;
 use WineTestBot::Utils;
 
 
-my $PART_BOUNDARY = "==13F70BD1-BA1B-449A-9CCB-B6A8E90CED47==";
-
-
 #
 # Logging and error handling helpers
 #
@@ -216,18 +213,9 @@ sub SendLog($)
     print $Sendmail "In-Reply-To: ", $Job->Patch->MessageId, "\n";
     print $Sendmail "References: ", $Job->Patch->MessageId, "\n";
   }
-  print $Sendmail <<"EOF";
-MIME-Version: 1.0
-Content-Type: multipart/mixed; boundary="$PART_BOUNDARY"
-
---$PART_BOUNDARY
-Content-Type: text/plain; charset="UTF-8"
-MIME-Version: 1.0
-Content-Transfer-Encoding: 8bit
-Content-Disposition: inline
 
-VM                   Status   Failures Command
-EOF
+  print $Sendmail "\n";
+  print $Sendmail "VM                   Status   Failures Command\n";
   foreach my $StepTask (@$SortedStepsTasks)
   {
     my $TestFailures = $StepTask->TestFailures;
@@ -242,7 +230,7 @@ EOF
                      $TestFailures, $Cmd;
   }
 
-  print $Sendmail "\nYou can also see the results at:\n$JobURL\n\n";
+  print $Sendmail "\nThe full results can be found at:\n$JobURL\n\n";
 
   # Print the job summary
   my $JobErrors;
@@ -271,35 +259,6 @@ EOF
     }
   }
 
-  # Print the log attachments
-  foreach my $StepTask (@$SortedStepsTasks)
-  {
-    my $TaskDir = $StepTask->GetTaskDir();
-
-    foreach my $LogName (@{$JobErrors->{$StepTask->Id}->{LogNames}})
-    {
-      print $Sendmail <<"EOF";
-
---$PART_BOUNDARY
-Content-Type: text/plain; charset="UTF-8"
-MIME-Version: 1.0
-Content-Transfer-Encoding: 8bit
-EOF
-      # Prepend the VM name to get unique attachment filenames for this email.
-      print $Sendmail "Content-Disposition: attachment; filename=",
-                      $StepTask->VM->Name, "-$LogName\n\n";
-      if ($Debug)
-      {
-        print $Sendmail "Not dumping logs in debug mode\n";
-      }
-      else
-      {
-        DumpLogAndErr($Sendmail, "$TaskDir/$LogName");
-      }
-    }
-  }
-
-  print $Sendmail "\n--$PART_BOUNDARY--\n";
   close($Sendmail);
 
   # This is all for jobs submitted from the website
-- 
2.30.2



More information about the wine-devel mailing list