ahuston-0/hydra
1
0
Fork 0
Code Issues Pull Requests 1 Packages Projects Releases Wiki Activity

Hydra/56: handle failed builds with result only at build level, not buildsteps

Browse Source
This commit is contained in:
Rob Vermaas 2011-03-07 13:55:43 +00:00
parent f95ded45a5
commit d4e9f5383b
1 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/script/hydra_build.pl.in
View File

@ -282,10 +282,6 @@ sub doBuild {
my $stepOutpath = $step->outpath; my $stepOutpath = $step->outpath;
my $stepStatus = 0; 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}); $step->update({busy => 0, status => $stepStatus, stoptime => time});
}); });
} }
@ -365,8 +361,6 @@ sub doBuild {
if ($thisBuildFailed) { $buildStatus = 1; } if ($thisBuildFailed) { $buildStatus = 1; }
elsif ($someBuildFailed) { $buildStatus = 2; } elsif ($someBuildFailed) { $buildStatus = 2; }
else { $buildStatus = 3; } else { $buildStatus = 3; }
} else {
$buildStatus = 6 if $thisBuildFailed;
} }
# Only store the output of running Nix if we have a miscellaneous error. # Only store the output of running Nix if we have a miscellaneous error.
@ -397,6 +391,10 @@ sub doBuild {
my $releaseName = getReleaseName($outPath); my $releaseName = getReleaseName($outPath);
if ($buildStatus == 0 && -f "$outPath/nix-support/failed") {
$buildStatus = 6;
}
$db->resultset('BuildResultInfo')->create( $db->resultset('BuildResultInfo')->create(
{ id => $build->id { id => $build->id
, iscachedbuild => $isCachedBuild , iscachedbuild => $isCachedBuild