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

* Add the name of the jobset to ReleaseSetJobs, otherwise we can't

Browse Source 
distinguish between jobs with the same name in different jobsets
  (e.g. "trunk" vs "stdenv-branch" for Nixpkgs).
* Renamed the "attrName" field of Builds to "job".
* Renamed the "id" field of BuildSteps to "build".
This commit is contained in:
Eelco Dolstra
2009-03-12 14:18:30 +00:00
parent fec08462ee
commit a623ad157e
29 changed files with 96 additions and 88 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/script/hydra_scheduler.pl
View File

@ -155,7 +155,7 @@ sub fetchInputAlt {
# Pick the most recent successful build of the specified job.
(my $prevBuild) = $db->resultset('Builds')->search(
{finished => 1, project => $project->name, jobset => $jobset->name, attrname => $jobName, buildStatus => 0},
{finished => 1, project => $project->name, jobset => $jobset->name, job => $jobName, buildStatus => 0},
{join => 'resultInfo', order_by => "timestamp DESC", rows => 1});
if (!defined $prevBuild || !isValidPath($prevBuild->outpath)) {
@ -218,7 +218,7 @@ sub checkJob {
$db->txn_do(sub {
if (scalar($db->resultset('Builds')->search(
{ project => $project->name, jobset => $jobset->name
, attrname => $jobName, outPath => $outPath })) > 0)
, job => $jobName, outPath => $outPath })) > 0)
{
print "already scheduled/done\n";
return;
@ -231,7 +231,7 @@ sub checkJob {
, timestamp => time()
, project => $project->name
, jobset => $jobset->name
, attrname => $jobName
, job => $jobName
, description => $job->{description}
, longdescription => $job->{longDescription}
, license => $job->{license}