Author: rob
Date: Mon Mar 7 13:55:43 2011
New Revision: 26192
URL: https://svn.nixos.org/websvn/nix/?rev=26192&sc=1
Log:
Hydra/56: handle failed builds with result only at build level, not buildsteps
Modified:
hydra/trunk/src/script/hydra_build.pl.in
Modified: hydra/trunk/src/script/hydra_build.pl.in
==============================================================================
--- hydra/trunk/src/script/hydra_build.pl.in Mon Mar 7 12:37:01 2011
(r26191)
+++ hydra/trunk/src/script/hydra_build.pl.in Mon Mar 7 13:55:43 2011
(r26192)
@@ -282,10 +282,6 @@
my $stepOutpath = $step->outpath;
my $stepStatus = 0;
- # when $out/nix-support/failed exists, build actually
failed, exit code is in the file, status code for such builds is 6
- $stepStatus = 6 if -f "$stepOutpath/nix-support/failed";
- $thisBuildFailed = 1 if ($drvPath eq $drvPathStep &&
$stepStatus == 6);
-
$step->update({busy => 0, status => $stepStatus, stoptime
=> time});
});
}
@@ -365,9 +361,7 @@
if ($thisBuildFailed) { $buildStatus = 1; }
elsif ($someBuildFailed) { $buildStatus = 2; }
else { $buildStatus = 3; }
- } else {
- $buildStatus = 6 if $thisBuildFailed;
- }
+ }
# Only store the output of running Nix if we have a miscellaneous
error.
$errormsg = undef unless $buildStatus == 3;
@@ -397,6 +391,10 @@
my $releaseName = getReleaseName($outPath);
+ if ($buildStatus == 0 && -f "$outPath/nix-support/failed") {
+ $buildStatus = 6;
+ }
+
$db->resultset('BuildResultInfo')->create(
{ id => $build->id
, iscachedbuild => $isCachedBuild
_______________________________________________
nix-commits mailing list
[email protected]
http://mail.cs.uu.nl/mailman/listinfo/nix-commits
