Francois Gouget : testbot/web: Add a page to create special jobs.
Alexandre Julliard
julliard at winehq.org
Fri Sep 27 12:48:56 CDT 2019
Module: tools
Branch: master
Commit: fc4933ddbf3c978553e3793f80f5a0a7abdc4837
URL: https://source.winehq.org/git/tools.git/?a=commit;h=fc4933ddbf3c978553e3793f80f5a0a7abdc4837
Author: Francois Gouget <fgouget at codeweavers.com>
Date: Fri Sep 27 13:03:59 2019 +0200
testbot/web: Add a page to create special jobs.
These can be used to schedule a WineTest run on a specific VM or when
the jobs were not created automatically for whatever reason.
Note that the web server typically does not own the latest/ files and
thus cannot hard-link them.
Signed-off-by: Francois Gouget <fgouget at codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard at winehq.org>
---
testbot/lib/WineTestBot/CGI/PageBase.pm | 2 +
testbot/lib/WineTestBot/SpecialJobs.pm | 12 +-
testbot/web/admin/SpecialJobs.pl | 265 ++++++++++++++++++++++++++++++++
3 files changed, 276 insertions(+), 3 deletions(-)
diff --git a/testbot/lib/WineTestBot/CGI/PageBase.pm b/testbot/lib/WineTestBot/CGI/PageBase.pm
index e3d2e04..613bddd 100644
--- a/testbot/lib/WineTestBot/CGI/PageBase.pm
+++ b/testbot/lib/WineTestBot/CGI/PageBase.pm
@@ -287,6 +287,8 @@ EOF
if (defined($Session) && $Session->User->HasRole("admin"))
{
print " <li class='top'><p>Admin</p></li>\n";
+ print " <li><p><a href='", MakeSecureURL("/admin/SpecialJobs.pl"),
+ "'>Special Jobs</a></p></li>\n";
print " <li><p><a href='", MakeSecureURL("/admin/UsersList.pl"),
"'>Users</a></p></li>\n";
print " <li class='divider'> </li>\n";
diff --git a/testbot/lib/WineTestBot/SpecialJobs.pm b/testbot/lib/WineTestBot/SpecialJobs.pm
index c313567..0371084 100644
--- a/testbot/lib/WineTestBot/SpecialJobs.pm
+++ b/testbot/lib/WineTestBot/SpecialJobs.pm
@@ -36,6 +36,8 @@ our @EXPORT = qw(GetReconfigVMs AddReconfigJob
GetWindowsTestVMs AddWindowsTestJob
GetWineTestVMs AddWineTestJob);
+use File::Copy;
+
use WineTestBot::Config;
use WineTestBot::Jobs;
use WineTestBot::Missions;
@@ -189,9 +191,13 @@ sub AddWindowsTestJob($$$$$)
return "Failed to save the '$Remarks' job: $ErrMessage";
}
- # Stage the test file so it can be picked up by the job
- if (!link("$DataDir/latest/$LatestBaseName",
- "$DataDir/staging/job". $NewJob->Id ."_$LatestBaseName"))
+ # Stage the test file so it can be picked up by the job. Note that the
+ # caller may not own the latest files and thus may be unable to hard-link
+ # them (e.g. web server).
+ my $LatestFileName = "$DataDir/latest/$LatestBaseName";
+ my $StagingFileName = "$DataDir/staging/job". $NewJob->Id ."_$LatestBaseName";
+ if (!link($LatestFileName, $StagingFileName) &&
+ !copy($LatestFileName, $StagingFileName))
{
return "Failed to stage $LatestBaseName: $!";
}
diff --git a/testbot/web/admin/SpecialJobs.pl b/testbot/web/admin/SpecialJobs.pl
new file mode 100644
index 0000000..1556b55
--- /dev/null
+++ b/testbot/web/admin/SpecialJobs.pl
@@ -0,0 +1,265 @@
+# -*- Mode: Perl; perl-indent-level: 2; indent-tabs-mode: nil -*-
+# WineTestBot special jobs creation page
+#
+# Copyright 2019 Francois Gouget
+#
+# This library is free software; you can redistribute it and/or
+# modify it under the terms of the GNU Lesser General Public
+# License as published by the Free Software Foundation; either
+# version 2.1 of the License, or (at your option) any later version.
+#
+# This library is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+# Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public
+# License along with this library; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
+
+use strict;
+
+package SpecialJobsPage;
+
+use ObjectModel::CGI::FreeFormPage;
+our @ISA = qw(ObjectModel::CGI::FreeFormPage);
+
+use WineTestBot::Config;
+use WineTestBot::Engine::Notify;
+use WineTestBot::SpecialJobs;
+use WineTestBot::Utils;
+use WineTestBot::Log;
+
+
+#
+# Page state management
+#
+
+sub _initialize($$$)
+{
+ my ($self, $Request, $RequiredRole) = @_;
+
+ $self->{JobTemplates} = {
+ "Build" => {Label => "Update build VMs",
+ Options => ["No", "All Build VMs"],
+ VMs => GetReconfigVMs(undef, "build"),
+ },
+ "Win32" => {Label => "Run the 32 bit WineTest suite on Windows VMs",
+ Options => ["No", "All Base VMs", "All WineTest VMs",
+ "All Base and WineTest VMs"],
+ VMs => GetWindowsTestVMs(undef, "exe32", undef),
+ },
+ "Win64" => {Label => "Run the 64 bit WineTest suite on Windows VMs",
+ Options => ["No", "All Base VMs", "All WineTest VMs",
+ "All Base and WineTest VMs"],
+ VMs => GetWindowsTestVMs(undef, "exe64", undef),
+ },
+ "Wine" => {Label => "Update Wine VMs",
+ Options => ["No", "All Wine VMs"],
+ VMs => GetReconfigVMs(undef, "wine"),
+ },
+ "WineTest" => {Label => "Run the WineTest suite on Wine VMs",
+ Options => ["No", "All Wine VMs"],
+ VMs => GetWineTestVMs(undef),
+ },
+ };
+
+ foreach my $JobName (keys %{$self->{JobTemplates}})
+ {
+ my $JobTemplate = $self->{JobTemplates}->{$JobName};
+ my $VMKey = $self->GetParam($JobName);
+ foreach my $Option (@{$JobTemplate->{Options}})
+ {
+ if ($VMKey eq "*$Option")
+ {
+ $JobTemplate->{VMKey} = $VMKey;
+ last;
+ }
+ }
+ if (!exists $JobTemplate->{VMKey})
+ {
+ foreach my $VM (@{$JobTemplate->{VMs}})
+ {
+ if ($VMKey eq $VM->Name)
+ {
+ $JobTemplate->{VMKey} = $VM->Name;
+ last;
+ }
+ }
+ }
+ $JobTemplate->{VMKey} ||= "*No";
+ }
+
+ $self->SUPER::_initialize($Request, $RequiredRole, undef);
+}
+
+
+#
+# Page generation
+#
+
+sub GetTitle($)
+{
+ #my ($self) = @_;
+ return "Create Special Jobs";
+}
+
+sub GenerateJobFields($$$$$)
+{
+ my ($self, $JobName) = @_;
+
+ my $JobTemplate = $self->{JobTemplates}->{$JobName};
+ return if (!@{$JobTemplate->{VMs}});
+
+ print "<div class='ItemProperty'><label>$JobTemplate->{Label}</label>\n",
+ "<div class='ItemValue'>\n",
+ "<select name='$JobName' size='1'>\n";
+ foreach my $Option (@{$JobTemplate->{Options}})
+ {
+ my $Selected = $JobTemplate->{VMKey} eq "*$Option" ? " selected" : "";
+ print "<option value='*", $self->CGI->escapeHTML($Option),
+ "'$Selected>$Option</option>\n";
+ }
+ foreach my $VM (@{$JobTemplate->{VMs}})
+ {
+ my $Selected = $JobTemplate->{VMKey} eq $VM->Name ? " selected" : "";
+ print "<option value='", $self->CGI->escapeHTML($VM->Name),
+ "'$Selected>", $self->CGI->escapeHTML($VM->Name), "</option>\n";
+ }
+ print "</select> </div></div>\n";
+}
+
+sub GenerateFields($)
+{
+ my ($self) = @_;
+
+ $self->GenerateJobFields("Build");
+ $self->GenerateJobFields("Win32");
+ $self->GenerateJobFields("Win64");
+
+ $self->GenerateJobFields("Wine");
+ $self->GenerateJobFields("WineTest");
+
+ $self->SUPER::GenerateFields();
+}
+
+sub GetActions($)
+{
+ my ($self) = @_;
+
+ my $Actions = $self->SUPER::GetActions();
+ push @$Actions, "Submit";
+ return $Actions;
+}
+
+
+#
+# Page actions
+#
+
+sub OnSubmit($)
+{
+ my ($self) = @_;
+ my $VMKey;
+ my @Errors = ();
+
+ # Update Build VMs
+ $VMKey = $self->{JobTemplates}->{Build}->{VMKey};
+ if ($VMKey ne "*No")
+ {
+ $VMKey = undef if ($VMKey eq "*All Wine VMs");
+ my $VMs = GetReconfigVMs($VMKey, "build");
+ push @Errors, "Found no build VM to update" if (!@$VMs);
+ my $ErrMessage = AddReconfigJob($VMs, $VMKey, "build");
+ }
+
+ # Run 32 bit WineTest
+ $VMKey = $self->{JobTemplates}->{Win32}->{VMKey};
+ if ($VMKey ne "*No")
+ {
+ my @BaseJobs = $VMKey eq "*All Base VMs" ? ("base") :
+ $VMKey eq "*All WineTest VMs" ? ("other") :
+ $VMKey eq "*All Base and WineTest VMs" ? ("base", "other") :
+ (undef);
+ $VMKey = undef if ($VMKey =~ /^\*/);
+ foreach my $BaseJob (@BaseJobs)
+ {
+ my $VMs = GetWindowsTestVMs($VMKey, "exe32", $BaseJob);
+ push @Errors, "Found no $BaseJob VM to run WineTest on" if (!@$VMs);
+ my $ErrMessage = AddWindowsTestJob($VMs, $VMKey, "exe32", $BaseJob, "winetest-latest.exe");
+ push @Errors, $ErrMessage if (defined $ErrMessage);
+ }
+ }
+
+ # Run 64 bit WineTest
+ $VMKey = $self->{JobTemplates}->{Win64}->{VMKey};
+ if ($VMKey ne "*No")
+ {
+ # Traditionally we don't create separate 'base' and 'other' jobs for
+ # 64 bit VMs.
+ my $BaseJob = $VMKey eq "*All Base VMs" ? "base" :
+ $VMKey eq "*All WineTest VMs" ? "other" :
+ $VMKey eq "*All Base and WineTest VMs" ? "all" :
+ undef;
+ $VMKey = undef if ($VMKey eq "*All Base and WineTest VMs");
+ my $VMs = GetWindowsTestVMs($VMKey, "exe64", $BaseJob);
+ push @Errors, "Found no 64 bit VM to run WineTest on" if (!@$VMs);
+ my $ErrMessage = AddWindowsTestJob($VMs, $VMKey, "exe64", $BaseJob, "winetest64-latest.exe");
+ push @Errors, $ErrMessage if (defined $ErrMessage);
+ }
+
+ # Update Wine VMs
+ $VMKey = $self->{JobTemplates}->{Wine}->{VMKey};
+ if ($VMKey ne "*No")
+ {
+ $VMKey = undef if ($VMKey eq "*All Wine VMs");
+ my $VMs = GetReconfigVMs($VMKey, "wine");
+ push @Errors, "Found no Wine VM to update" if (!@$VMs);
+ my $ErrMessage = AddReconfigJob($VMs, $VMKey, "wine");
+ push @Errors, $ErrMessage if (defined $ErrMessage);
+ }
+
+ # Run WineTest on Wine
+ $VMKey = $self->{JobTemplates}->{WineTest}->{VMKey};
+ if ($VMKey ne "*No")
+ {
+ $VMKey = undef if ($VMKey eq "*All Wine VMs");
+ my $VMs = GetWineTestVMs($VMKey);
+ push @Errors, "Found no Wine VM to run WineTest on" if (!@$VMs);
+ my $ErrMessage = AddWineTestJob($VMs, $VMKey);
+ push @Errors, $ErrMessage if (defined $ErrMessage);
+ }
+
+ # Notify engine
+ my $ErrMessage = RescheduleJobs();
+ push @Errors, $ErrMessage if (defined $ErrMessage);
+
+ if (@Errors)
+ {
+ $self->{ErrMessage} = join("\n", @Errors);
+ return undef;
+ }
+
+ $self->Redirect("/"); # does not return
+ exit;
+}
+
+sub OnAction($$)
+{
+ my ($self, $Action) = @_;
+
+ if ($Action eq "Submit")
+ {
+ return $self->OnSubmit();
+ }
+
+ return $self->SUPER::OnAction($Action);
+}
+
+
+package main;
+
+my $Request = shift;
+
+my $SubmitPage = SpecialJobsPage->new($Request, "admin");
+$SubmitPage->GeneratePage();
More information about the wine-cvs
mailing list