vriska/hydra
0
0
Fork 0
forked from lix-project/hydra
Code Pull requests Activity

Browse source
This commit is contained in:
Eelco Dolstra 2008-11-08 22:40:12 +00:00
parent ffd0f75692
commit 74c952d073
11 changed files with 29 additions and 36 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/HydraFrontend/lib/HydraFrontend/Schema.pm
View file

@ -8,8 +8,8 @@ use base 'DBIx::Class::Schema';
__PACKAGE__->load_classes; __PACKAGE__->load_classes;
# Created by DBIx::Class::Schema::Loader v0.04005 @ 2008-11-07 17:44:37 # Created by DBIx::Class::Schema::Loader v0.04005 @ 2008-11-08 23:34:46
# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:WdXbmj1/EvPeU107AjY6zw # DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:Gl/KqOOAg3rH0hWZUovhxw
# You can replace this text with custom content, and it will be preserved on regeneration # You can replace this text with custom content, and it will be preserved on regeneration

6
src/HydraFrontend/lib/HydraFrontend/Schema/Buildinputs.pm
View file

@ -25,7 +25,7 @@ __PACKAGE__->add_columns(
"path", "path",
{ data_type => "text", is_nullable => 0, size => undef }, { data_type => "text", is_nullable => 0, size => undef },
"value", "value",
{ data_type => "VARCHAR", is_nullable => 0, size => undef }, { data_type => "text", is_nullable => 0, size => undef },
); );
__PACKAGE__->set_primary_key("buildid", "name"); __PACKAGE__->set_primary_key("buildid", "name");
__PACKAGE__->belongs_to( __PACKAGE__->belongs_to(
@ -35,8 +35,8 @@ __PACKAGE__->belongs_to(
); );
# Created by DBIx::Class::Schema::Loader v0.04005 @ 2008-11-07 17:44:37 # Created by DBIx::Class::Schema::Loader v0.04005 @ 2008-11-08 23:34:46
# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:GBvbApjpjiwkUQsdZg1PLg # DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:2XeATQWeO3i3eSHlquS2QA
__PACKAGE__->belongs_to( __PACKAGE__->belongs_to(
"build", "build",

4
src/HydraFrontend/lib/HydraFrontend/Schema/Buildlogs.pm
View file

@ -25,8 +25,8 @@ __PACKAGE__->belongs_to(
); );
# Created by DBIx::Class::Schema::Loader v0.04005 @ 2008-11-07 17:44:37 # Created by DBIx::Class::Schema::Loader v0.04005 @ 2008-11-08 23:34:46
# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:vLByOFOHkwwHa6hf8nC1Jg # DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:tlyJLjDbR0vk3Jt/O3M4nw
# You can replace this text with custom content, and it will be preserved on regeneration # You can replace this text with custom content, and it will be preserved on regeneration

12
src/HydraFrontend/lib/HydraFrontend/Schema/Buildproducts.pm
View file

@ -10,16 +10,14 @@ __PACKAGE__->table("buildProducts");
__PACKAGE__->add_columns( __PACKAGE__->add_columns(
"buildid", "buildid",
{ data_type => "integer", is_nullable => 0, size => undef }, { data_type => "integer", is_nullable => 0, size => undef },
"path",
{ data_type => "text", is_nullable => 0, size => undef },
"type", "type",
{ data_type => "text", is_nullable => 0, size => undef }, { data_type => "text", is_nullable => 0, size => undef },
"subtype", "subtype",
{ data_type => "text", is_nullable => 0, size => undef }, { data_type => "text", is_nullable => 0, size => undef },
"path",
{ data_type => "text", is_nullable => 0, size => undef },
"productnr",
{ data_type => "integer", is_nullable => 0, size => undef },
); );
__PACKAGE__->set_primary_key("buildid", "productnr"); __PACKAGE__->set_primary_key("buildid", "path");
__PACKAGE__->belongs_to( __PACKAGE__->belongs_to(
"buildid", "buildid",
"HydraFrontend::Schema::Builds", "HydraFrontend::Schema::Builds",
@ -27,8 +25,8 @@ __PACKAGE__->belongs_to(
); );
# Created by DBIx::Class::Schema::Loader v0.04005 @ 2008-11-07 17:44:37 # Created by DBIx::Class::Schema::Loader v0.04005 @ 2008-11-08 23:34:46
# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:4exGa1a3mCSv3b8Lqwu7Hw # DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:lCdfeZud7izQv/11dVFFVA
# You can replace this text with custom content, and it will be preserved on regeneration # You can replace this text with custom content, and it will be preserved on regeneration

14
src/HydraFrontend/lib/HydraFrontend/Schema/Builds.pm
View file

@ -38,6 +38,11 @@ __PACKAGE__->add_columns(
{ data_type => "text", is_nullable => 0, size => undef }, { data_type => "text", is_nullable => 0, size => undef },
); );
__PACKAGE__->set_primary_key("id"); __PACKAGE__->set_primary_key("id");
__PACKAGE__->has_many(
"buildinputs",
"HydraFrontend::Schema::Buildinputs",
{ "foreign.buildid" => "self.id" },
);
__PACKAGE__->has_many( __PACKAGE__->has_many(
"buildproducts", "buildproducts",
"HydraFrontend::Schema::Buildproducts", "HydraFrontend::Schema::Buildproducts",
@ -48,15 +53,10 @@ __PACKAGE__->has_many(
"HydraFrontend::Schema::Buildlogs", "HydraFrontend::Schema::Buildlogs",
{ "foreign.buildid" => "self.id" }, { "foreign.buildid" => "self.id" },
); );
__PACKAGE__->has_many(
"buildinputs",
"HydraFrontend::Schema::Buildinputs",
{ "foreign.buildid" => "self.id" },
);
# Created by DBIx::Class::Schema::Loader v0.04005 @ 2008-11-07 17:44:37 # Created by DBIx::Class::Schema::Loader v0.04005 @ 2008-11-08 23:34:46
# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:xsDBmgfas2tM/Dn9PE/eXQ # DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:JRXGOLW2h+DOY7LZUdkCWQ
__PACKAGE__->has_many(dependentBuildInputs => 'HydraFrontend::Schema::Buildinputs', 'inputid'); __PACKAGE__->has_many(dependentBuildInputs => 'HydraFrontend::Schema::Buildinputs', 'inputid');

4
src/HydraFrontend/lib/HydraFrontend/Schema/Jobsetinputalts.pm
View file

@ -33,8 +33,8 @@ __PACKAGE__->belongs_to(
); );
# Created by DBIx::Class::Schema::Loader v0.04005 @ 2008-11-07 17:44:37 # Created by DBIx::Class::Schema::Loader v0.04005 @ 2008-11-08 23:34:46
# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:8fi3nwRY3VrwApBAW6XrQQ # DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:m24w17dWVxjIqPlea77G3A
# You can replace this text with custom content, and it will be preserved on regeneration # You can replace this text with custom content, and it will be preserved on regeneration

4
src/HydraFrontend/lib/HydraFrontend/Schema/Jobsetinputs.pm
View file

@ -43,8 +43,8 @@ __PACKAGE__->has_many(
); );
# Created by DBIx::Class::Schema::Loader v0.04005 @ 2008-11-07 17:44:37 # Created by DBIx::Class::Schema::Loader v0.04005 @ 2008-11-08 23:34:46
# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:0uYHZfy1ZXCTLc3AsFWI0w # DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:ufIbhVFTzl7awpRrZofvJQ
# You can replace this text with custom content, and it will be preserved on regeneration # You can replace this text with custom content, and it will be preserved on regeneration

4
src/HydraFrontend/lib/HydraFrontend/Schema/Jobsets.pm
View file

@ -40,8 +40,8 @@ __PACKAGE__->has_many(
); );
# Created by DBIx::Class::Schema::Loader v0.04005 @ 2008-11-07 17:44:37 # Created by DBIx::Class::Schema::Loader v0.04005 @ 2008-11-08 23:34:46
# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:g1LPc13y/7/ngDzFqL5jXQ # DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:7hm28Izo7wCZc07fH1EJRg
# You can replace this text with custom content, and it will be preserved on regeneration # You can replace this text with custom content, and it will be preserved on regeneration

4
src/HydraFrontend/lib/HydraFrontend/Schema/Projects.pm
View file

@ -19,8 +19,8 @@ __PACKAGE__->has_many(
); );
# Created by DBIx::Class::Schema::Loader v0.04005 @ 2008-11-07 17:44:37 # Created by DBIx::Class::Schema::Loader v0.04005 @ 2008-11-08 23:34:46
# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:fIpNlZNqqGDGGWd6EORCAA # DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:WCqXnL5vOhpwjYB9/Aw7tg
# You can replace this text with custom content, and it will be preserved on regeneration # You can replace this text with custom content, and it will be preserved on regeneration

5
src/hydra.sql
View file

@ -42,11 +42,10 @@ create table buildInputs (
create table buildProducts ( create table buildProducts (
buildId integer not null, buildId integer not null,
productnr integer not null, path text not null,
type text not null, -- "nix-build", "file", "doc", "report", ... type text not null, -- "nix-build", "file", "doc", "report", ...
subtype text not null, -- "source-dist", "rpm", ... subtype text not null, -- "source-dist", "rpm", ...
path text not null, primary key (buildId, path),
primary key (buildId, productnr),
foreign key (buildId) references builds(id) on delete cascade -- ignored by sqlite foreign key (buildId) references builds(id) on delete cascade -- ignored by sqlite
); );

4
src/scheduler.pl
View file

@ -96,8 +96,6 @@ sub buildJob {
if ($outputCreated) { if ($outputCreated) {
my $productnr = 0;
if (-e "$outPath/log") { if (-e "$outPath/log") {
foreach my $logPath (glob "$outPath/log/*") { foreach my $logPath (glob "$outPath/log/*") {
print " LOG $logPath\n"; print " LOG $logPath\n";
@ -120,7 +118,6 @@ sub buildJob {
die unless -e $path; die unless -e $path;
$db->resultset('Buildproducts')->create( $db->resultset('Buildproducts')->create(
{ buildid => $build->id { buildid => $build->id
, productnr => $productnr++
, type => $type , type => $type
, subtype => $subtype , subtype => $subtype
, path => $path , path => $path
@ -130,7 +127,6 @@ sub buildJob {
} else { } else {
$db->resultset('Buildproducts')->create( $db->resultset('Buildproducts')->create(
{ buildid => $build->id { buildid => $build->id
, productnr => $productnr++
, type => "nix-build" , type => "nix-build"
, subtype => "" , subtype => ""
, path => $outPath , path => $outPath