Module: tools
Branch: master
Commit: 37157577717d7d5dcc82cc30e3e3ec3c0d5ad207
URL: https://source.winehq.org/git/tools.git/?a=commit;h=37157577717d7d5dcc82cc3…
Author: Francois Gouget <fgouget(a)codeweavers.com>
Date: Sun Feb 9 18:44:27 2020 +0100
testbot/WineRun*: Don't abort and retry if ParseTaskLog() fails.
It makes sense to retry if retrieving Task.log fails because it may be
caused by a temporary network issue. But ParseTaskLog() would only fail
if there is a bug or the TestBot was set up wrong. Since retrying would
not help it is better to simply report the error.
Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard(a)winehq.org>
---
testbot/bin/WineRunBuild.pl | 2 +-
testbot/bin/WineRunReconfig.pl | 2 +-
testbot/bin/WineRunWineTest.pl | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/testbot/bin/WineRunBuild.pl b/testbot/bin/WineRunBuild.pl
index e7a90aa..2764ffc 100755
--- a/testbot/bin/WineRunBuild.pl
+++ b/testbot/bin/WineRunBuild.pl
@@ -435,7 +435,7 @@ if ($TA->GetFile("Build.log", "$TaskDir/task.log"))
}
elsif (defined $LogInfo->{BadLog})
{
- FatalError("$LogInfo->{BadLog}\n", "retry");
+ # Let CreateLogErrorsCache() report it
}
else
{
diff --git a/testbot/bin/WineRunReconfig.pl b/testbot/bin/WineRunReconfig.pl
index d854048..897b675 100755
--- a/testbot/bin/WineRunReconfig.pl
+++ b/testbot/bin/WineRunReconfig.pl
@@ -430,7 +430,7 @@ if ($TA->GetFile("Reconfig.log", "$TaskDir/task.log"))
}
elsif (defined $LogInfo->{BadLog})
{
- FatalError("$LogInfo->{BadLog}\n", "retry");
+ # Let CreateLogErrorsCache() report it
}
else
{
diff --git a/testbot/bin/WineRunWineTest.pl b/testbot/bin/WineRunWineTest.pl
index c35d6c0..f6e6c97 100755
--- a/testbot/bin/WineRunWineTest.pl
+++ b/testbot/bin/WineRunWineTest.pl
@@ -525,7 +525,7 @@ if ($TA->GetFile("Task.log", "$TaskDir/task.log"))
}
elsif (defined $LogInfo->{BadLog})
{
- FatalError("$LogInfo->{BadLog}\n", "retry");
+ # Let CreateLogErrorsCache() report it
}
elsif ($LogInfo->{Type} eq "build")
{
Module: tools
Branch: master
Commit: 99dbbf84b0191d0827a71e9c7a32a9e40e3ce1d3
URL: https://source.winehq.org/git/tools.git/?a=commit;h=99dbbf84b0191d0827a71e9…
Author: Francois Gouget <fgouget(a)codeweavers.com>
Date: Sun Feb 9 18:43:56 2020 +0100
testbot: Cache the log error lists in .errors files.
Prior to this patch the log files needed to be parsed every time the
error list is needed. Parsing the reference report and diffing its
errors also needs to be repeated every time the list of new errors
is needed. Both of these have a significant impact on the JobDetails
page load time.
So this patch lets the task scripts (WineRun*) extract the log file
errors when they complete, detect the new errors, and saves the result
in a .errors file stored next to the original log file. All that's
needed then is to read the small .errors file to get the full errors
list along with their status (old or new) which speeds up WineSendLog
and JobDetails.
However the task scripts cannot generate the errors cache file for the
testbot.log file because that file is complete only once the task
scripts exits. So the errors cache file for it is generated by the
WineSendLog script once the job completes.
Furthermore the .err files were used to store the validation errors
detected by the ParseWineTestReport() function. These are now stored
as the '.Extra' error group in the .errors files, making the .err files
redundant.
Then instead of showing the content of the xxx and xxx.err file in
succession, the scripts either just iterate over all the error groups,
or present the full content of the log first and then show the 'extra'
error groups, that is those that are not tied to a specific log line
number.
Note: This requires running UpdateTaskLogs to create the new .errors
files and to delete the obsolete .err files.
Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=48035
Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard(a)winehq.org>
---
testbot/bin/Janitor.pl | 2 +-
testbot/bin/UpdateTaskLogs | 136 ++++++++++-------
testbot/bin/WineRunBuild.pl | 2 +
testbot/bin/WineRunReconfig.pl | 2 +
testbot/bin/WineRunTask.pl | 17 ++-
testbot/bin/WineRunWineTest.pl | 16 +-
testbot/bin/WineSendLog.pl | 111 +++++++++-----
testbot/lib/WineTestBot/LogUtils.pm | 275 +++++++++++++++++++++++++++++-----
testbot/lib/WineTestBot/StepsTasks.pm | 7 -
testbot/lib/WineTestBot/Tasks.pm | 4 +
testbot/web/JobDetails.pl | 91 +++++------
11 files changed, 445 insertions(+), 218 deletions(-)
Diff: https://source.winehq.org/git/tools.git/?a=commitdiff;h=99dbbf84b0191d0827a…
Module: website
Branch: master
Commit: e207c764fd635e3c06206c3507033128b9164c65
URL: https://source.winehq.org/git/website.git/?a=commit;h=e207c764fd635e3c06206…
Author: Jeremy Newman <jnewman(a)codeweavers.com>
Date: Mon Feb 10 09:17:57 2020 -0600
wineconf 2020 hosting
---
templates/en/home.template | 20 ++++++++++++++++++--
1 file changed, 18 insertions(+), 2 deletions(-)
diff --git a/templates/en/home.template b/templates/en/home.template
index cc8d5de9..75db7fdc 100644
--- a/templates/en/home.template
+++ b/templates/en/home.template
@@ -75,7 +75,7 @@
<div class="item">
<img src="https://appdb.winehq.org/images/metatrader5.jpg" alt="Twelfth slide">
</div>
- </div>
+ </div>
<a class="left carousel-control" href="#carouselScreenshots" data-slide="prev">
<span class="glyphicon glyphicon-chevron-left"></span>
<span class="sr-only">Previous</span>
@@ -159,7 +159,23 @@
<div class="whq-page-container margin-top-md">
- <h1 class="title"><a href="{$root}/news">News and Updates</a></h1>
+ <h2 class="title"><a href="http://wiki.winehq.org/Organising_WineConf">WineConf Call for Hosts</a></h2>
+
+ <p>This is a call for proposals to host the next WineConf sometime this year. Ideally proposals would present;</p>
+
+ <ul>
+ <li>Proposed dates</li>
+ <li>Proposed city</li>
+ <li>Information on potential venues and travel</li>
+ </ul>
+
+ <p>We'll need to choose a host relatively quickly as it does take time to plan and book the event. I'm hoping we can settle on a host by the end of February but ultimately that decision goes to the Wine Committee. Questions, comments, concerns can be posted on the <a href="{$root}/forums">WineConf mailing list</a>. A draft of a guide to hosting has been started on the wiki [1]. Please take a look to get a sense of what is involved in hosting the conference.</p>
+
+ <p>1. <a href="https://wiki.winehq.org/Organising_WineConf">https://wiki.winehq.org/Organising_WineConf</a></p>
+
+ <br>
+
+ <h2 class="title"><a href="{$root}/news">News and Updates</a></h2>
<!--EXEC:[news?n=3]-->