Author: rob
Date: Fri Sep 3 09:17:52 2010
New Revision: 23611
URL: https://svn.nixos.org/websvn/nix/?rev=23611&sc=1
Log:
hydra: moves jobsetOverview sub
Modified:
hydra/trunk/src/lib/Hydra/Controller/Project.pm
hydra/trunk/src/lib/Hydra/Helper/Nix.pm
Modified: hydra/trunk/src/lib/Hydra/Controller/Project.pm
==============================================================================
--- hydra/trunk/src/lib/Hydra/Controller/Project.pm Fri Sep 3 08:44:38
2010 (r23610)
+++ hydra/trunk/src/lib/Hydra/Controller/Project.pm Fri Sep 3 09:17:52
2010 (r23611)
@@ -6,9 +6,6 @@
use Hydra::Helper::Nix;
use Hydra::Helper::CatalystUtils;
-our @ISA = qw(Exporter);
-our @EXPORT = qw(jobsetOverview);
-
sub project : Chained('/') PathPart('project') CaptureArgs(1) {
my ($self, $c, $projectName) = @_;
@@ -19,20 +16,6 @@
}
-sub jobsetOverview {
- my ($c, $project) = @_;
- return $project->jobsets->search( isProjectOwner($c, $project->name) ?
{} : { hidden => 0 },
- { order_by => "name"
- , "+select" => [
- "(SELECT COUNT(*) FROM Builds AS a NATURAL JOIN BuildSchedulingInfo
WHERE me.project = a.project AND me.name = a.jobset AND a.isCurrent = 1 )"
- , "(SELECT COUNT(*) FROM Builds AS a NATURAL JOIN BuildResultInfo WHERE
me.project = a.project AND me.name = a.jobset AND buildstatus <> 0 AND
a.isCurrent = 1 )"
- , "(SELECT COUNT(*) FROM Builds AS a NATURAL JOIN BuildResultInfo WHERE
me.project = a.project AND me.name = a.jobset AND buildstatus = 0 AND
a.isCurrent = 1 )"
- , "(SELECT COUNT(*) FROM Builds AS a WHERE me.project = a.project AND
me.name = a.jobset AND a.isCurrent = 1 )"
- ]
- , "+as" => ["nrscheduled", "nrfailed", "nrsucceeded", "nrtotal"]
- });
-}
-
sub view : Chained('project') PathPart('') Args(0) {
my ($self, $c) = @_;
Modified: hydra/trunk/src/lib/Hydra/Helper/Nix.pm
==============================================================================
--- hydra/trunk/src/lib/Hydra/Helper/Nix.pm Fri Sep 3 08:44:38 2010
(r23610)
+++ hydra/trunk/src/lib/Hydra/Helper/Nix.pm Fri Sep 3 09:17:52 2010
(r23611)
@@ -5,6 +5,7 @@
use File::Path;
use File::Basename;
use Nix;
+use Hydra::Helper::CatalystUtils;
our @ISA = qw(Exporter);
our @EXPORT = qw(
@@ -13,7 +14,7 @@
registerRoot getGCRootsDir gcRootFor
getPrimaryBuildsForView
getPrimaryBuildTotal
- getViewResult getLatestSuccessfulViewResult );
+ getViewResult getLatestSuccessfulViewResult jobsetOverview);
sub isValidPath {
@@ -196,6 +197,19 @@
return $thisBuild;
}
+sub jobsetOverview {
+ my ($c, $project) = @_;
+ return $project->jobsets->search( isProjectOwner($c, $project->name) ? {} :
{ hidden => 0 },
+ { order_by => "name"
+ , "+select" => [
+ "(SELECT COUNT(*) FROM Builds AS a NATURAL JOIN BuildSchedulingInfo
WHERE me.project = a.project AND me.name = a.jobset AND a.isCurrent = 1 )"
+ , "(SELECT COUNT(*) FROM Builds AS a NATURAL JOIN BuildResultInfo WHERE
me.project = a.project AND me.name = a.jobset AND buildstatus <> 0 AND
a.isCurrent = 1 )"
+ , "(SELECT COUNT(*) FROM Builds AS a NATURAL JOIN BuildResultInfo WHERE
me.project = a.project AND me.name = a.jobset AND buildstatus = 0 AND
a.isCurrent = 1 )"
+ , "(SELECT COUNT(*) FROM Builds AS a WHERE me.project = a.project AND
me.name = a.jobset AND a.isCurrent = 1 )"
+ ]
+ , "+as" => ["nrscheduled", "nrfailed", "nrsucceeded", "nrtotal"]
+ });
+}
sub getViewResult {
my ($primaryBuild, $jobs) = @_;
_______________________________________________
nix-commits mailing list
[email protected]
http://mail.cs.uu.nl/mailman/listinfo/nix-commits
