From f2f586d8421395146d1c1de8cc47e1bff372cbd2 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Thu, 12 Mar 2009 23:46:17 +0000 Subject: [PATCH] * Disambiguate jobs by jobset name. I.e. jobs with the same name in different jobsets are not considered the same job. --- src/lib/Hydra/Controller/Job.pm | 17 ++++++++---- src/lib/Hydra/Controller/Project.pm | 4 +-- src/lib/Hydra/Schema.pm | 4 +-- src/lib/Hydra/Schema/BuildInputs.pm | 4 +-- src/lib/Hydra/Schema/BuildProducts.pm | 4 +-- src/lib/Hydra/Schema/BuildResultInfo.pm | 4 +-- src/lib/Hydra/Schema/BuildSchedulingInfo.pm | 4 +-- src/lib/Hydra/Schema/BuildSteps.pm | 4 +-- src/lib/Hydra/Schema/Builds.pm | 4 +-- src/lib/Hydra/Schema/CachedPathInputs.pm | 4 +-- .../Hydra/Schema/CachedSubversionInputs.pm | 4 +-- src/lib/Hydra/Schema/JobsetInputAlts.pm | 4 +-- src/lib/Hydra/Schema/JobsetInputs.pm | 6 ++--- src/lib/Hydra/Schema/Jobsets.pm | 6 ++--- src/lib/Hydra/Schema/Projects.pm | 4 +-- src/lib/Hydra/Schema/ReleaseSetJobs.pm | 4 +-- src/lib/Hydra/Schema/ReleaseSets.pm | 4 +-- src/lib/Hydra/Schema/SystemTypes.pm | 4 +-- src/lib/Hydra/Schema/UserRoles.pm | 4 +-- src/lib/Hydra/Schema/Users.pm | 4 +-- src/root/all.tt | 2 +- src/root/build.tt | 16 ++++++++--- src/root/common.tt | 27 ++++++++++++++++--- src/script/hydra_scheduler.pl | 1 + src/sql/hydra.sql | 2 +- 25 files changed, 90 insertions(+), 55 deletions(-) diff --git a/src/lib/Hydra/Controller/Job.pm b/src/lib/Hydra/Controller/Job.pm index fb1fadf2..5a8d5440 100644 --- a/src/lib/Hydra/Controller/Job.pm +++ b/src/lib/Hydra/Controller/Job.pm @@ -7,12 +7,19 @@ use Hydra::Helper::Nix; use Hydra::Helper::CatalystUtils; -sub job : Chained('/project/project') PathPart('job') CaptureArgs(1) { - my ($self, $c, $jobName) = @_; +sub job : Chained('/') PathPart('job') CaptureArgs(3) { + my ($self, $c, $projectName, $jobsetName, $jobName) = @_; + # !!! cut&paste from Project::project. + my $project = $c->model('DB::Projects')->find($projectName) + or notFound($c, "Project $projectName doesn't exist."); + + $c->stash->{curProject} = $project; + + $c->stash->{jobset} = $project->jobsets->find({name => $jobsetName}) + or notFound($c, "Jobset $jobsetName doesn't exist."); + $c->stash->{jobName} = $jobName; - - # !!! nothing to do here yet, since we don't have a jobs table. } @@ -26,7 +33,7 @@ sub index : Chained('job') PathPart('') Args(0) { sub get_builds : Chained('job') PathPart('') CaptureArgs(0) { my ($self, $c) = @_; $c->stash->{allBuilds} = - $c->stash->{curProject}->builds->search({job => $c->stash->{jobName}}); + $c->stash->{jobset}->builds->search({job => $c->stash->{jobName}}); $c->stash->{channelBaseName} = $c->stash->{curProject}->name . "-" . $c->stash->{jobName}; } diff --git a/src/lib/Hydra/Controller/Project.pm b/src/lib/Hydra/Controller/Project.pm index e61fe6e8..d03020c2 100644 --- a/src/lib/Hydra/Controller/Project.pm +++ b/src/lib/Hydra/Controller/Project.pm @@ -10,8 +10,8 @@ use Hydra::Helper::CatalystUtils; sub project : Chained('/') PathPart('project') CaptureArgs(1) { my ($self, $c, $projectName) = @_; - my $project = $c->model('DB::Projects')->find($projectName); - notFound($c, "Project $projectName doesn't exist.") unless defined $project; + my $project = $c->model('DB::Projects')->find($projectName) + or notFound($c, "Project $projectName doesn't exist."); $c->stash->{curProject} = $project; } diff --git a/src/lib/Hydra/Schema.pm b/src/lib/Hydra/Schema.pm index 51c037ce..3fa70881 100644 --- a/src/lib/Hydra/Schema.pm +++ b/src/lib/Hydra/Schema.pm @@ -8,8 +8,8 @@ use base 'DBIx::Class::Schema'; __PACKAGE__->load_classes; -# Created by DBIx::Class::Schema::Loader v0.04005 @ 2009-03-12 14:55:11 -# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:oeLeU2T8C2dVBS+ugF0p8g +# Created by DBIx::Class::Schema::Loader v0.04005 @ 2009-03-12 17:44:15 +# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:oIv4qqdjLKRDgAYXHHTz8A # You can replace this text with custom content, and it will be preserved on regeneration diff --git a/src/lib/Hydra/Schema/BuildInputs.pm b/src/lib/Hydra/Schema/BuildInputs.pm index 70f14611..632d5b8f 100644 --- a/src/lib/Hydra/Schema/BuildInputs.pm +++ b/src/lib/Hydra/Schema/BuildInputs.pm @@ -36,8 +36,8 @@ __PACKAGE__->belongs_to("build", "Hydra::Schema::Builds", { id => "build" }); __PACKAGE__->belongs_to("dependency", "Hydra::Schema::Builds", { id => "dependency" }); -# Created by DBIx::Class::Schema::Loader v0.04005 @ 2009-03-12 14:55:11 -# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:CLL7aeJ0fe0NX3LCnNs4/A +# Created by DBIx::Class::Schema::Loader v0.04005 @ 2009-03-12 17:44:15 +# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:9gWr8DPEeH2BjoHT3nt0Lw # You can replace this text with custom content, and it will be preserved on regeneration diff --git a/src/lib/Hydra/Schema/BuildProducts.pm b/src/lib/Hydra/Schema/BuildProducts.pm index 14681c90..b7777030 100644 --- a/src/lib/Hydra/Schema/BuildProducts.pm +++ b/src/lib/Hydra/Schema/BuildProducts.pm @@ -35,8 +35,8 @@ __PACKAGE__->set_primary_key("build", "productnr"); __PACKAGE__->belongs_to("build", "Hydra::Schema::Builds", { id => "build" }); -# Created by DBIx::Class::Schema::Loader v0.04005 @ 2009-03-12 14:55:11 -# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:9Eer/gLCKlOKfnwC+kfFaw +# Created by DBIx::Class::Schema::Loader v0.04005 @ 2009-03-12 17:44:15 +# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:GsPyt1OUQHWN6z7mSpNW2g # You can replace this text with custom content, and it will be preserved on regeneration diff --git a/src/lib/Hydra/Schema/BuildResultInfo.pm b/src/lib/Hydra/Schema/BuildResultInfo.pm index 5d84cca2..b31e267b 100644 --- a/src/lib/Hydra/Schema/BuildResultInfo.pm +++ b/src/lib/Hydra/Schema/BuildResultInfo.pm @@ -35,8 +35,8 @@ __PACKAGE__->set_primary_key("id"); __PACKAGE__->belongs_to("id", "Hydra::Schema::Builds", { id => "id" }); -# Created by DBIx::Class::Schema::Loader v0.04005 @ 2009-03-12 14:55:11 -# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:ieF3JOI4N3XZUyMboZhrjg +# Created by DBIx::Class::Schema::Loader v0.04005 @ 2009-03-12 17:44:15 +# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:zIpamqoL0AxNFDpQ/W1TVg __PACKAGE__->belongs_to( "failedDep", diff --git a/src/lib/Hydra/Schema/BuildSchedulingInfo.pm b/src/lib/Hydra/Schema/BuildSchedulingInfo.pm index 00b41134..4e33b332 100644 --- a/src/lib/Hydra/Schema/BuildSchedulingInfo.pm +++ b/src/lib/Hydra/Schema/BuildSchedulingInfo.pm @@ -27,8 +27,8 @@ __PACKAGE__->set_primary_key("id"); __PACKAGE__->belongs_to("id", "Hydra::Schema::Builds", { id => "id" }); -# Created by DBIx::Class::Schema::Loader v0.04005 @ 2009-03-12 14:55:11 -# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:oomDjaTJHIQjraUqhzFPsg +# Created by DBIx::Class::Schema::Loader v0.04005 @ 2009-03-12 17:44:15 +# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:McWRZEMJtjFIcR4LplCc9A # You can replace this text with custom content, and it will be preserved on regeneration diff --git a/src/lib/Hydra/Schema/BuildSteps.pm b/src/lib/Hydra/Schema/BuildSteps.pm index bd3ec11f..42a73016 100644 --- a/src/lib/Hydra/Schema/BuildSteps.pm +++ b/src/lib/Hydra/Schema/BuildSteps.pm @@ -35,7 +35,7 @@ __PACKAGE__->set_primary_key("build", "stepnr"); __PACKAGE__->belongs_to("build", "Hydra::Schema::Builds", { id => "build" }); -# Created by DBIx::Class::Schema::Loader v0.04005 @ 2009-03-12 14:55:11 -# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:+nb1zsYcv9WziZ6IHcc/yw +# Created by DBIx::Class::Schema::Loader v0.04005 @ 2009-03-12 17:44:15 +# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:zuyAJq4T5Ynsq920Pd7hLg 1; diff --git a/src/lib/Hydra/Schema/Builds.pm b/src/lib/Hydra/Schema/Builds.pm index 217c0878..b95c6b6f 100644 --- a/src/lib/Hydra/Schema/Builds.pm +++ b/src/lib/Hydra/Schema/Builds.pm @@ -76,8 +76,8 @@ __PACKAGE__->has_many( ); -# Created by DBIx::Class::Schema::Loader v0.04005 @ 2009-03-12 14:55:11 -# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:UahvxjBmn7b70IK+QcnKHA +# Created by DBIx::Class::Schema::Loader v0.04005 @ 2009-03-12 17:44:15 +# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:6taCYZNB0HaY+fvDjUhrYQ __PACKAGE__->has_many(dependents => 'Hydra::Schema::BuildInputs', 'dependency'); diff --git a/src/lib/Hydra/Schema/CachedPathInputs.pm b/src/lib/Hydra/Schema/CachedPathInputs.pm index 79a9754a..3041c54a 100644 --- a/src/lib/Hydra/Schema/CachedPathInputs.pm +++ b/src/lib/Hydra/Schema/CachedPathInputs.pm @@ -22,8 +22,8 @@ __PACKAGE__->add_columns( __PACKAGE__->set_primary_key("srcpath", "sha256hash"); -# Created by DBIx::Class::Schema::Loader v0.04005 @ 2009-03-12 14:55:11 -# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:+AZEuCFAfkl7SKwlxDBnaw +# Created by DBIx::Class::Schema::Loader v0.04005 @ 2009-03-12 17:44:15 +# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:Jhu1KxMfSF1Y1b4VGUqTzg # You can replace this text with custom content, and it will be preserved on regeneration diff --git a/src/lib/Hydra/Schema/CachedSubversionInputs.pm b/src/lib/Hydra/Schema/CachedSubversionInputs.pm index f19a0d8d..6618dc47 100644 --- a/src/lib/Hydra/Schema/CachedSubversionInputs.pm +++ b/src/lib/Hydra/Schema/CachedSubversionInputs.pm @@ -20,8 +20,8 @@ __PACKAGE__->add_columns( __PACKAGE__->set_primary_key("uri", "revision"); -# Created by DBIx::Class::Schema::Loader v0.04005 @ 2009-03-12 14:55:11 -# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:2JtWOkH5OVGl7Cb7STLM5Q +# Created by DBIx::Class::Schema::Loader v0.04005 @ 2009-03-12 17:44:15 +# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:9aQa6Zo6z3lj/qFHNF5//w # You can replace this text with custom content, and it will be preserved on regeneration diff --git a/src/lib/Hydra/Schema/JobsetInputAlts.pm b/src/lib/Hydra/Schema/JobsetInputAlts.pm index b38057fa..5365642c 100644 --- a/src/lib/Hydra/Schema/JobsetInputAlts.pm +++ b/src/lib/Hydra/Schema/JobsetInputAlts.pm @@ -31,8 +31,8 @@ __PACKAGE__->belongs_to( ); -# Created by DBIx::Class::Schema::Loader v0.04005 @ 2009-03-12 14:55:11 -# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:ka/dxG48LaZOQeShZFs0Hw +# Created by DBIx::Class::Schema::Loader v0.04005 @ 2009-03-12 17:44:15 +# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:fBv361MRwuWvAJQnOLZDIw # You can replace this text with custom content, and it will be preserved on regeneration diff --git a/src/lib/Hydra/Schema/JobsetInputs.pm b/src/lib/Hydra/Schema/JobsetInputs.pm index dc3fb113..cb799c85 100644 --- a/src/lib/Hydra/Schema/JobsetInputs.pm +++ b/src/lib/Hydra/Schema/JobsetInputs.pm @@ -22,7 +22,7 @@ __PACKAGE__->has_many( "jobsets", "Hydra::Schema::Jobsets", { - "foreign.name" => "self.job", + "foreign.name" => "self.jobset", "foreign.nixexprinput" => "self.name", "foreign.project" => "self.project", }, @@ -43,8 +43,8 @@ __PACKAGE__->has_many( ); -# Created by DBIx::Class::Schema::Loader v0.04005 @ 2009-03-12 14:55:11 -# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:earsp0XPWppy5/VOJkQ/PA +# Created by DBIx::Class::Schema::Loader v0.04005 @ 2009-03-12 17:44:15 +# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:S8AQqv8/GkLkXpPutV4N0A # You can replace this text with custom content, and it will be preserved on regeneration diff --git a/src/lib/Hydra/Schema/Jobsets.pm b/src/lib/Hydra/Schema/Jobsets.pm index 84af627c..62ecd17e 100644 --- a/src/lib/Hydra/Schema/Jobsets.pm +++ b/src/lib/Hydra/Schema/Jobsets.pm @@ -38,7 +38,7 @@ __PACKAGE__->belongs_to("project", "Hydra::Schema::Projects", { name => "project __PACKAGE__->belongs_to( "jobsetinput", "Hydra::Schema::JobsetInputs", - { job => "name", name => "nixexprinput", project => "project" }, + { jobset => "name", name => "nixexprinput", project => "project" }, ); __PACKAGE__->has_many( "jobsetinputs", @@ -50,8 +50,8 @@ __PACKAGE__->has_many( ); -# Created by DBIx::Class::Schema::Loader v0.04005 @ 2009-03-12 14:55:11 -# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:ADLNgkS2YPv4DuszwHau7g +# Created by DBIx::Class::Schema::Loader v0.04005 @ 2009-03-12 17:44:15 +# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:xYDUCEXRPeVdFJBQnG/Wog # You can replace this text with custom content, and it will be preserved on regeneration diff --git a/src/lib/Hydra/Schema/Projects.pm b/src/lib/Hydra/Schema/Projects.pm index 984f3d89..1118f798 100644 --- a/src/lib/Hydra/Schema/Projects.pm +++ b/src/lib/Hydra/Schema/Projects.pm @@ -45,8 +45,8 @@ __PACKAGE__->has_many( ); -# Created by DBIx::Class::Schema::Loader v0.04005 @ 2009-03-12 14:55:11 -# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:R/GeZxDujiuKze++Mc2ZTw +# Created by DBIx::Class::Schema::Loader v0.04005 @ 2009-03-12 17:44:15 +# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:9ZqA/21u40pt4t85YrYbeg # You can replace this text with custom content, and it will be preserved on regeneration diff --git a/src/lib/Hydra/Schema/ReleaseSetJobs.pm b/src/lib/Hydra/Schema/ReleaseSetJobs.pm index db633df6..965a3c57 100644 --- a/src/lib/Hydra/Schema/ReleaseSetJobs.pm +++ b/src/lib/Hydra/Schema/ReleaseSetJobs.pm @@ -34,8 +34,8 @@ __PACKAGE__->belongs_to( ); -# Created by DBIx::Class::Schema::Loader v0.04005 @ 2009-03-12 14:55:11 -# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:OM2joIa3Bj6t9BhVrOjN8Q +# Created by DBIx::Class::Schema::Loader v0.04005 @ 2009-03-12 17:44:15 +# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:Ta71pOzVsej/w0FoHIUMbg # You can replace this text with custom content, and it will be preserved on regeneration diff --git a/src/lib/Hydra/Schema/ReleaseSets.pm b/src/lib/Hydra/Schema/ReleaseSets.pm index bce5091d..21818679 100644 --- a/src/lib/Hydra/Schema/ReleaseSets.pm +++ b/src/lib/Hydra/Schema/ReleaseSets.pm @@ -29,8 +29,8 @@ __PACKAGE__->has_many( ); -# Created by DBIx::Class::Schema::Loader v0.04005 @ 2009-03-12 14:55:11 -# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:gSzri22yKGHLKCjNLv9/VQ +# Created by DBIx::Class::Schema::Loader v0.04005 @ 2009-03-12 17:44:15 +# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:0DtIgm5jznjy1l3809b06Q # You can replace this text with custom content, and it will be preserved on regeneration diff --git a/src/lib/Hydra/Schema/SystemTypes.pm b/src/lib/Hydra/Schema/SystemTypes.pm index 7b9f2209..deb73e11 100644 --- a/src/lib/Hydra/Schema/SystemTypes.pm +++ b/src/lib/Hydra/Schema/SystemTypes.pm @@ -16,8 +16,8 @@ __PACKAGE__->add_columns( __PACKAGE__->set_primary_key("system"); -# Created by DBIx::Class::Schema::Loader v0.04005 @ 2009-03-12 14:55:11 -# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:viZlvDAHk9k8ScuA/qfUGw +# Created by DBIx::Class::Schema::Loader v0.04005 @ 2009-03-12 17:44:15 +# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:WUSl5Uivcl6E1KLxiq+89A # You can replace this text with custom content, and it will be preserved on regeneration diff --git a/src/lib/Hydra/Schema/UserRoles.pm b/src/lib/Hydra/Schema/UserRoles.pm index 26424248..159b4206 100644 --- a/src/lib/Hydra/Schema/UserRoles.pm +++ b/src/lib/Hydra/Schema/UserRoles.pm @@ -17,8 +17,8 @@ __PACKAGE__->set_primary_key("username", "role"); __PACKAGE__->belongs_to("username", "Hydra::Schema::Users", { username => "username" }); -# Created by DBIx::Class::Schema::Loader v0.04005 @ 2009-03-12 14:55:11 -# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:gRuZJKELtc15+vQFjxjkKQ +# Created by DBIx::Class::Schema::Loader v0.04005 @ 2009-03-12 17:44:15 +# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:x/HXSH7s3bgPJSLK71hV9w # You can replace this text with custom content, and it will be preserved on regeneration diff --git a/src/lib/Hydra/Schema/Users.pm b/src/lib/Hydra/Schema/Users.pm index 4ea4cee2..c70a7171 100644 --- a/src/lib/Hydra/Schema/Users.pm +++ b/src/lib/Hydra/Schema/Users.pm @@ -30,8 +30,8 @@ __PACKAGE__->has_many( ); -# Created by DBIx::Class::Schema::Loader v0.04005 @ 2009-03-12 14:55:11 -# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:Lomf54EURbBIbrWGojiFIw +# Created by DBIx::Class::Schema::Loader v0.04005 @ 2009-03-12 17:44:15 +# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:uP86PxN/ZWgy5PRVU7Qgow # You can replace this text with custom content, and it will be preserved on regeneration diff --git a/src/root/all.tt b/src/root/all.tt index 62218696..e6f53964 100644 --- a/src/root/all.tt +++ b/src/root/all.tt @@ -2,7 +2,7 @@ [% PROCESS common.tt %]

All Builds - [% IF jobName %]for Job [% curProject.name %]:[% jobName %][% ELSE %] + [% IF jobName %]for Job [% curProject.name %]:[% jobset.name %]:[% jobName %][% ELSE %] [% IF curProject %] for Project [% curProject.name %][% END %][% END %]

Showing builds [% (page - 1) * resultsPerPage + 1 %] - [% (page - 1) * resultsPerPage + builds.size %] diff --git a/src/root/build.tt b/src/root/build.tt index a6e15e59..2005d1f5 100644 --- a/src/root/build.tt +++ b/src/root/build.tt @@ -3,8 +3,12 @@ [% PROCESS "product-list.tt" %] [% USE HTML %] +[% project = build.get_column('project') %] +[% jobset = build.get_column('jobset') %] +[% job = build.get_column('job') %] +

- Job [% build.project.name %]:[% build.job %] build [% id %] + Job [% project %]:[% jobset %]:[% job %] build [% id %] [% IF !build.finished %] [% IF build.schedulingInfo.busy %] (currently building) @@ -73,15 +77,15 @@ Project: - [% build.project.name %] + [% PROCESS renderProjectName %] Jobset: - [% build.jobset.name %] + [% PROCESS renderJobsetName %] Job name: - [% build.job %] + [% PROCESS renderJobName %] Nix name: @@ -105,6 +109,10 @@ License: [% IF build.license %][% HTML.escape(build.license) %][% ELSE %](not given)[% END %] + + Homepage: + [% IF build.homepage %] build.homepage) %]>[% HTML.escape(build.homepage) %][% ELSE %](not given)[% END %] + System: [% build.system %] diff --git a/src/root/common.tt b/src/root/common.tt index 157d5a4c..cf21652c 100644 --- a/src/root/common.tt +++ b/src/root/common.tt @@ -18,6 +18,25 @@ [% END %] +[% BLOCK renderProjectName -%] +[% project %][% END -%] + + +[% BLOCK renderJobsetName -%] +[% jobset %][% END -%] + + +[% BLOCK renderJobName -%] +[% job %][% END -%] + + +[% BLOCK renderFullJobName %] + + [% PROCESS renderProjectName %]:[% PROCESS renderJobsetName %]:[% PROCESS renderJobName %] + +[% END %] + + [% BLOCK renderBuildList %] @@ -29,9 +48,8 @@ [% IF showSchedulingInfo %] [% END %] - - + @@ -60,8 +78,9 @@ [% IF showSchedulingInfo %] [% END %] - - + diff --git a/src/script/hydra_scheduler.pl b/src/script/hydra_scheduler.pl index 75f51c5e..4d24d2cc 100755 --- a/src/script/hydra_scheduler.pl +++ b/src/script/hydra_scheduler.pl @@ -235,6 +235,7 @@ sub checkJob { , description => $job->{description} , longdescription => $job->{longDescription} , license => $job->{license} + , homepage => $job->{homepage} , nixname => $job->{nixName} , drvpath => $drvPath , outpath => $outPath diff --git a/src/sql/hydra.sql b/src/sql/hydra.sql index f3fdb855..24a65291 100644 --- a/src/sql/hydra.sql +++ b/src/sql/hydra.sql @@ -200,7 +200,7 @@ create table Jobsets ( lastCheckedTime integer, -- last time the scheduler looked at this jobset primary key (project, name), foreign key (project) references Projects(name) on delete cascade, -- ignored by sqlite - foreign key (project, name, nixExprInput) references JobsetInputs(project, job, name) + foreign key (project, name, nixExprInput) references JobsetInputs(project, jobset, name) );
PriorityProject JobNameRelease Name System Timestamp Description[% build.schedulingInfo.priority %][% build.get_column("project") %][% build.job %] + [% PROCESS renderFullJobName project=build.get_column("project") jobset = build.get_column("jobset") job = build.job %] + [% build.resultInfo.releasename ? build.resultInfo.releasename : build.nixname %] [% build.system %] [% date.format(build.timestamp, '%Y-%m-%d %H:%M:%S') %]