Francois Gouget : testbot/WineRunReconfig: Use SpecialJobs to create the WineTest job.

[Alexandre Julliard]

Module: tools
Branch: master
Commit: 03268afd2ba530ebb95c72f3795f397386dd7abe
URL:    https://source.winehq.org/git/tools.git/?a=commit;h=03268afd2ba530ebb95c72f3...

Author: Francois Gouget <fgouget(a)codeweavers.com>
Date:   Thu Sep 26 13:35:15 2019 +0200

testbot/WineRunReconfig: Use SpecialJobs to create the WineTest job.

Also notify the administrator if that job creation fails.

Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard(a)winehq.org>

---

 testbot/bin/WineRunReconfig.pl | 20 +++++++++++++++++---
 1 file changed, 17 insertions(+), 3 deletions(-)

diff --git a/testbot/bin/WineRunReconfig.pl b/testbot/bin/WineRunReconfig.pl
index 2e62a2e..0bf417b 100755
--- a/testbot/bin/WineRunReconfig.pl
+++ b/testbot/bin/WineRunReconfig.pl
@@ -526,10 +526,24 @@ if ($NewStatus eq 'completed')
     FatalError("Could not recreate the $IdleSnapshot snapshot: $ErrMessage\n");
   }
 
-  if ($VM->Type eq "wine" and
-      system("$BinDir/CheckForWinetestUpdate.pl", "--vm", $VM->Name, "--create", "winetest"))
+  if ($VM->Type eq "wine")
   {
-    Error("Could not create a job to run WineTest on the ". $VM->Name ." VM\n");
+    require WineTestBot::SpecialJobs;
+    $ErrMessage = WineTestBot::SpecialJobs::AddWineTestJob([$VM], $VM->Name);
+    if (defined $ErrMessage)
+    {
+      Error("Could not create a WineTest job for ". $VM->Name .": $ErrMessage\n");
+      NotifyAdministrator("Could not create a WineTest job for ". $VM->Name,
+        "Could not create a job to run WineTest on ". $VM->Name
+        ." after its update:\n\n".
+        "$ErrMessage\n\n".
+        "See the link below for more details:\n".
+        MakeSecureURL(GetTaskURL($JobId, $StepNo, $TaskNo)) ."\n");
+    }
+    else
+    {
+      Debug(Elapsed($Start), " Added a WineTest job for ". $VM->Name ."\n");
+    }
   }
 }