lix-project/hydra
3
0
Fork 6
Code Issues 2 Pull requests Packages Projects Releases Wiki Activity

* Job status: show the active jobs.

Browse source
This commit is contained in:
Eelco Dolstra 2009-03-13 17:32:08 +00:00
parent 2ece4d9f15
commit 7c7c43335d
7 changed files with 21 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/lib/Hydra/Base/Controller/ListBuilds.pm
View file

@ -10,7 +10,9 @@ use Hydra::Helper::CatalystUtils;
sub jobstatus : Chained('get_builds') PathPart Args(0) {
my ($self, $c) = @_;
$c->stash->{template} = 'jobstatus.tt';
$c->stash->{latestBuilds} = getLatestBuilds($c, $c->stash->{allBuilds}, {});
my $jobs = $c->stash->{allJobs};
$c->stash->{latestBuilds} =
getLatestBuilds($c, ref $jobs eq "ARRAY" ? $jobs : scalar $jobs->search({active => 1}), {});
}
@ -41,7 +43,7 @@ sub nix : Chained('get_builds') PathPart('channel') CaptureArgs(1) {
eval {
if ($channelName eq "latest") {
$c->stash->{channelName} = $c->stash->{channelBaseName} . "-latest";
getChannelData($c, getLatestBuilds($c, $c->stash->{allBuilds}, {buildStatus => 0}));
getChannelData($c, getLatestBuilds($c, scalar $c->stash->{allJobs}->search({active => 1}), {buildStatus => 0}));
}
elsif ($channelName eq "all") {
$c->stash->{channelName} = $c->stash->{channelBaseName} . "-all";

3
src/lib/Hydra/Controller/Job.pm
View file

@ -27,6 +27,9 @@ sub index : Chained('job') PathPart('') Args(0) {
sub get_builds : Chained('job') PathPart('') CaptureArgs(0) {
my ($self, $c) = @_;
$c->stash->{allBuilds} = $c->stash->{job}->builds;
#$c->stash->{allJobs} = # !!! horribly hacky
# $c->stash->{job}->jobset->jobs->search({name => $c->stash->{job}->name});
$c->stash->{allJobs} = [$c->stash->{job}];
$c->stash->{channelBaseName} =
$c->stash->{project}->name . "-" . $c->stash->{jobset}->name . "-" . $c->stash->{job}->name;
}

4
src/lib/Hydra/Controller/Jobset.pm
View file

@ -29,8 +29,8 @@ sub index : Chained('jobset') PathPart('') Args(0) {
# Hydra::Base::Controller::ListBuilds needs this.
sub get_builds : Chained('jobset') PathPart('') CaptureArgs(0) {
my ($self, $c) = @_;
$c->stash->{allBuilds} =
$c->stash->{jobset}->builds;
$c->stash->{allBuilds} = $c->stash->{jobset}->builds;
$c->stash->{allJobs} = $c->stash->{jobset}->jobs;
$c->stash->{channelBaseName} =
$c->stash->{project}->name . "-" . $c->stash->{jobset}->name;
}

1
src/lib/Hydra/Controller/Project.pm
View file

@ -225,6 +225,7 @@ sub updateProject {
sub get_builds : Chained('project') PathPart('') CaptureArgs(0) {
my ($self, $c) = @_;
$c->stash->{allBuilds} = $c->stash->{project}->builds;
$c->stash->{allJobs} = $c->stash->{project}->jobs;
$c->stash->{channelBaseName} = $c->stash->{project}->name;
}

1
src/lib/Hydra/Controller/Root.pm
View file

@ -223,6 +223,7 @@ sub release :Local {
sub get_builds : Chained('/') PathPart('') CaptureArgs(0) {
my ($self, $c) = @_;
$c->stash->{allBuilds} = $c->model('DB::Builds');
$c->stash->{allJobs} = $c->model('DB::Jobs');
$c->stash->{channelBaseName} = "everything";
}

23
src/lib/Hydra/Helper/CatalystUtils.pm
View file

@ -45,22 +45,19 @@ sub getBuildStats {
# Return the latest build for each job.
sub getLatestBuilds {
my ($c, $builds, $extraAttrs) = @_;
my ($c, $jobs, $extraAttrs) = @_;
my @res = ();
foreach my $build ($builds->search({},
{group_by => ['project', 'job', 'system']}))
{
my $attrs =
{ project => $build->get_column('project')
, job => $build->get_column('job')
, system => $build->system
, finished => 1
};
my ($build) = $builds->search({ %$attrs, %$extraAttrs },
{ join => 'resultInfo', order_by => 'timestamp DESC', rows => 1 } );
push @res, $build if defined $build;
# !!! this could be done more efficiently.
foreach my $job (ref $jobs eq "ARRAY" ? @{$jobs} : $jobs->all) {
foreach my $system ($job->builds->search({}, {select => ['system'], distinct => 1})) {
my ($build) = $job->builds->search(
{ finished => 1, system => $system->system, %$extraAttrs },
{ join => 'resultInfo', order_by => 'timestamp DESC', rows => 1 });
push @res, $build if defined $build;
}
}
return [@res];

1
src/script/hydra_scheduler.pl
View file

@ -355,7 +355,6 @@ sub checkJobSet {
$db->txn_do(sub {
foreach my $jobInDB ($jobset->jobs->all) {
print $jobInDB->name, "\n";
$jobInDB->update({active => $jobNames{$jobInDB->name} || $failedJobNames{$jobInDB->name} ? 1 : 0});
if ($failedJobNames{$jobInDB->name}) {