grahamc/hydra - Change BVOPAMLSAU4UTV3DUX53OYDMXP2SETAQVUKAYE2OTCVVN4RD7LLQC

Created by Eelco Dolstra on November 10, 2008

BVOPAMLSAU4UTV3DUX53OYDMXP2SETAQVUKAYE2OTCVVN4RD7LLQC

Dependencies

In channels

upstream

main

Change contents

Insertion in src/HydraFrontend/lib/HydraFrontend/Controller/Root.pm at line 32 [3.804]
[3.1449]
[2.0]
```
    $c->stash->{jobs} = [$c->model('DB::Jobs')->all];
```

Replacement in src/HydraFrontend/lib/HydraFrontend/Schema/Buildlogs.pm at line 24 [3.3352]

B:BD[3.3992] → [2.213:355]

# Created by DBIx::Class::Schema::Loader v0.04005 @ 2008-11-09 01:36:21
# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:xvWlrugDQD11vH+7f91K0A

[3.3992]

[3.4134]

# Created by DBIx::Class::Schema::Loader v0.04005 @ 2008-11-10 10:30:11
# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:pt0CJFX1pP9Z2TjqrTjTkw

Replacement in src/HydraFrontend/lib/HydraFrontend/Schema/Buildproducts.pm at line 24 [3.4268]

B:BD[3.4922] → [2.502:644]

# Created by DBIx::Class::Schema::Loader v0.04005 @ 2008-11-09 01:36:21
# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:SMsT6htcybeWNHhv82+ilA

[3.4922]

[3.5064]

# Created by DBIx::Class::Schema::Loader v0.04005 @ 2008-11-10 10:30:11
# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:3NKUaF4u4H6ZmIRCeva8yA

Insertion in src/HydraFrontend/lib/HydraFrontend/Schema/Builds.pm at line 41 [3.5202]

[3.5950]

__PACKAGE__->belongs_to(
  "project",
  "HydraFrontend::Schema::Projects",
  { name => "project" },
);
__PACKAGE__->belongs_to(
  "jobset",
  "HydraFrontend::Schema::Jobsets",
  { name => "jobset", project => "project" },
);

Replacement in src/HydraFrontend/lib/HydraFrontend/Schema/Builds.pm at line 68 [3.5202]

B:BD[3.6194] → [2.803:945]

# Created by DBIx::Class::Schema::Loader v0.04005 @ 2008-11-09 01:36:21
# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:nfVureYYGM1V/NHroQA5Tw

[3.6194]

[4.0]

# Created by DBIx::Class::Schema::Loader v0.04005 @ 2008-11-10 10:30:11
# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:8s5Z03ugocOVb021EwGVag

Replacement in src/HydraFrontend/lib/HydraFrontend/Schema/Inputs.pm at line 38 [5.1]

B:BD[5.782] → [2.1501:1643]

# Created by DBIx::Class::Schema::Loader v0.04005 @ 2008-11-09 01:36:21
# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:3PAsUD+79bZk4vGeSyyACg

[5.782]

[5.924]

# Created by DBIx::Class::Schema::Loader v0.04005 @ 2008-11-10 10:30:11
# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:AzV6B/6CCrroPlO32n2p3A

Insertion in src/HydraFrontend/lib/HydraFrontend/Schema/Jobs.pm at line 16 [2.1742]
[2.2088]
[2.2088]
```
  { data_type => "integer", is_nullable => 0, size => undef },
  "busy",
```
Insertion in src/HydraFrontend/lib/HydraFrontend/Schema/Jobs.pm at line 19 [2.1742]
[2.2151]
[2.2151]
```
  "locker",
  { data_type => "text", is_nullable => 0, size => undef },
```

Insertion in src/HydraFrontend/lib/HydraFrontend/Schema/Jobs.pm at line 37 [2.1742]

[2.2704]

__PACKAGE__->belongs_to(
  "project",
  "HydraFrontend::Schema::Projects",
  { name => "project" },
);
__PACKAGE__->belongs_to(
  "jobset",
  "HydraFrontend::Schema::Jobsets",
  { name => "jobset", project => "project" },
);

Replacement in src/HydraFrontend/lib/HydraFrontend/Schema/Jobs.pm at line 49 [2.1742]

B:BD[2.2706] → [2.2706:2848]

# Created by DBIx::Class::Schema::Loader v0.04005 @ 2008-11-09 01:36:21
# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:T8O0XTTOZXapWpJbzjKLTw

[2.2706]

[2.2848]

# Created by DBIx::Class::Schema::Loader v0.04005 @ 2008-11-10 10:30:11
# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:GubRofAmJ/sbJbjyV3aKSQ

Replacement in src/HydraFrontend/lib/HydraFrontend/Schema/Jobsetinputalts.pm at line 9 [6.825]
B:BD[6.965] → [6.965:1004]
```
__PACKAGE__->table("jobSetInputAlts");
```
[6.965]
[6.1004]
```
__PACKAGE__->table("jobsetInputAlts");
```

Replacement in src/HydraFrontend/lib/HydraFrontend/Schema/Jobsetinputalts.pm at line 36 [6.825]

B:BD[6.1831] → [2.2976:3118]

# Created by DBIx::Class::Schema::Loader v0.04005 @ 2008-11-09 01:36:21
# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:DzEHCDlnponciGmGASknlg

[6.1831]

[6.1973]

# Created by DBIx::Class::Schema::Loader v0.04005 @ 2008-11-10 10:30:11
# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:ZjjWLbAWExxOqsDz41A3KA

Replacement in src/HydraFrontend/lib/HydraFrontend/Schema/Jobsetinputs.pm at line 9 [7.590]
B:BD[7.727] → [7.727:763]
```
__PACKAGE__->table("jobSetInputs");
```
[7.727]
[7.763]
```
__PACKAGE__->table("jobsetInputs");
```

Replacement in src/HydraFrontend/lib/HydraFrontend/Schema/Jobsetinputs.pm at line 46 [7.590]

B:BD[7.1681] → [2.3119:3261]

# Created by DBIx::Class::Schema::Loader v0.04005 @ 2008-11-09 01:36:21
# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:Lm2oIWEUSHFICYMX2qmTfw

[7.1681]

[7.1823]

# Created by DBIx::Class::Schema::Loader v0.04005 @ 2008-11-10 10:30:11
# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:6hzbFjPWQ872UxFhhpxjFg

Replacement in src/HydraFrontend/lib/HydraFrontend/Schema/Jobsets.pm at line 9 [7.1960]
B:BD[7.2092] → [7.2092:2123]
```
__PACKAGE__->table("jobSets");
```
[7.2092]
[7.2123]
```
__PACKAGE__->table("jobsets");
```

Insertion in src/HydraFrontend/lib/HydraFrontend/Schema/Jobsets.pm at line 23 [7.1960]

[7.2576]

__PACKAGE__->has_many(
  "builds",
  "HydraFrontend::Schema::Builds",
  {
    "foreign.jobset"  => "self.name",
    "foreign.project" => "self.project",
  },
);

Insertion in src/HydraFrontend/lib/HydraFrontend/Schema/Jobsets.pm at line 44 [7.1960]

[7.2914]

[6.2594]

  {
    "foreign.jobset"  => "self.name",
    "foreign.project" => "self.project",
  },
);
__PACKAGE__->has_many(
  "jobs",
  "HydraFrontend::Schema::Jobs",

Replacement in src/HydraFrontend/lib/HydraFrontend/Schema/Jobsets.pm at line 59 [7.1960]

B:BD[7.2992] → [2.3262:3404]

# Created by DBIx::Class::Schema::Loader v0.04005 @ 2008-11-09 01:36:21
# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:EmATMMeNmMd2AI8lVzcLFA

[7.2992]

[7.3134]

# Created by DBIx::Class::Schema::Loader v0.04005 @ 2008-11-10 10:30:11
# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:oRV4yw0DWG5PI0agcM7QHA

Insertion in src/HydraFrontend/lib/HydraFrontend/Schema/Projects.pm at line 16 [7.3266]

[7.3591]

  "builds",
  "HydraFrontend::Schema::Builds",
  { "foreign.project" => "self.name" },
);
__PACKAGE__->has_many(

Insertion in src/HydraFrontend/lib/HydraFrontend/Schema/Projects.pm at line 23 [7.3266]

[7.3640]

  { "foreign.project" => "self.name" },
);
__PACKAGE__->has_many(
  "jobs",
  "HydraFrontend::Schema::Jobs",

Replacement in src/HydraFrontend/lib/HydraFrontend/Schema/Projects.pm at line 32 [7.3266]

B:BD[7.3685] → [2.3405:3547]

# Created by DBIx::Class::Schema::Loader v0.04005 @ 2008-11-09 01:36:21
# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:ZifQocKoHOPRrJQSPggZ+w

[7.3685]

[7.3827]

# Created by DBIx::Class::Schema::Loader v0.04005 @ 2008-11-10 10:30:11
# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:9SeEXSEOH1ocrdkoa7fx5Q

Replacement in src/HydraFrontend/lib/HydraFrontend/Schema.pm at line 11 [3.6376]

B:BD[3.6498] → [2.3548:3690]

# Created by DBIx::Class::Schema::Loader v0.04005 @ 2008-11-09 01:36:21
# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:G17vptu+2rEUXbsqVtoXzQ

[3.6498]

[3.6640]

# Created by DBIx::Class::Schema::Loader v0.04005 @ 2008-11-10 10:30:11
# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:xP97YDrN7Bm2B/BlbQJ7fQ

Replacement in src/HydraFrontend/root/build.tt at line 4 [3.7350]

B:BD[3.7414] → [8.1291:1369]

<h1>Job <tt>[% build.project %]:[% build.attrname %]</tt> build [% id %]</h1>

[3.7414]

[5.2182]

<h1>Job <tt>[% build.project.name %]:[% build.attrname %]</tt> build [% id %]</h1>

Replacement in src/HydraFrontend/root/build.tt at line 16 [3.7350]

B:BD[9.451] → [10.518:616]

    <td><a href="[% c.uri_for('/project' build.project) %]"><tt>[% build.project %]</tt></a></td>

[9.451]

[9.493]

    <td><a href="[% c.uri_for('/project' build.project.name) %]"><tt>[% build.project.name %]</tt></a></td>

Replacement in src/HydraFrontend/root/build.tt at line 20 [3.7350]
B:BD[9.529] → [9.529:570]
```
    <td><tt>[% build.jobset %]</tt></td>
```
[9.529]
[3.7527]
```
    <td><tt>[% build.jobset.name %]</tt></td>
```

Replacement in src/HydraFrontend/root/build.tt at line 90 [3.7350]

B:BD[8.1583] → [2.4003:4183]

            <a href="[% c.uri_for('/build' input.dependency.id) %]">Job <tt>[% input.dependency.project %]:[% input.dependency.attrname %]</tt> build [% input.dependency.id %]</a>

[8.1583]

[6.3182]

            <a href="[% c.uri_for('/build' input.dependency.id) %]">Job <tt>[% input.dependency.project.name %]:[% input.dependency.attrname %]</tt> build [% input.dependency.id %]</a>

Replacement in src/HydraFrontend/root/build.tt at line 156 [3.7350]

B:BD[4.417] → [2.4257:4422]

        <td><a href="[% c.uri_for('/build' input.build.id) %]">Job <tt>[% input.build.project %]:[% input.build.attrname %]</tt> build [% input.build.id %]</a></td>

[4.417]

[4.590]

        <td><a href="[% c.uri_for('/build' input.build.id) %]">Job <tt>[% input.build.project.name %]:[% input.build.attrname %]</tt> build [% input.build.id %]</a></td>

Insertion in src/HydraFrontend/root/index.tt at line 2 [3.10713]
[3.10761]
[11.400]
```
[% USE date %]
<h1>Queue</h1>
```

Insertion in src/HydraFrontend/root/index.tt at line 6 [3.10713]

[11.401]

<table class="tablesorter">
  <thead>
    <tr><th>Priority</th><th>Project</th><th>Job</th><th>System</th><th>Timestamp</th><th>Description</th></tr>
  </thead>
  <tbody>
    [% FOREACH job IN jobs -%]
      <tr>
        <td>[% job.priority %]</td>
        <td><tt>[% job.project.name %]</tt></td>
        <td><tt>[% job.jobset.name %]</tt></td>
        <td><tt>[% job.system %]</tt></td>
        <td>[% date.format(job.timestamp, '%Y-%m-%d %H:%M:%S') %]</td>
        <td>[% job.description %]</td>
      </tr>
    [% END -%]
  </tbody>
</table>

Replacement in src/HydraFrontend/root/short-build-info.tt at line 12 [12.2074]

B:BD[12.2345] → [9.914:1010]

B:BD[9.1010] → [10.859:967]

  <td><a href="[% c.uri_for('/project' build.project) %]"><tt>[% build.project %]</tt></a></td>
  <td><a href="[% c.uri_for('/job' build.project build.attrname) %]"><tt>[% build.attrname %]</tt></a></td>

[12.2345]

[6.3752]

  <td><a href="[% c.uri_for('/project' build.project.name) %]"><tt>[% build.project.name %]</tt></a></td>
  <td><a href="[% c.uri_for('/job' build.project.name build.attrname) %]"><tt>[% build.attrname %]</tt></a></td>

Replacement in src/hydra.sql at line 7 [13.1]

B:BD[7.4302] → [7.4302:4354]

    jobSet        text not null, -- !!! foreign key

[7.4302]

[7.4354]

    jobset        text not null, -- !!! foreign key

Replacement in src/hydra.sql at line 19 [13.1]

B:BD[6.3819] → [6.3819:3851]

    system        text not null

[6.3819]

[5.2526]

    system        text not null,
    foreign key   (project) references projects(name), -- ignored by sqlite
    foreign key   (project, jobset) references jobsets(project, name) -- ignored by sqlite

Replacement in src/hydra.sql at line 34 [13.1]

∅:D[8.1816] → [5.2594:2664]

B:BD[5.2594] → [5.2594:2664]

    -- Copied from the jobSetInputs from which the build was created.

[8.1816]

[5.2664]

    -- Copied from the jobsetinputs from which the build was created.

Replacement in src/hydra.sql at line 89 [13.1]
B:BD[7.4706] → [7.4706:4729]
```
create table jobSets (
```
[7.4706]
[7.4729]
```
create table jobsets (
```

Replacement in src/hydra.sql at line 93 [13.1]

B:BD[7.4819] → [7.4819:4909]

    nixExprInput  text not null, -- name of the jobSetInput containing the Nix expression

[7.4819]

[7.4909]

    nixExprInput  text not null, -- name of the jobsetInput containing the Nix expression

Replacement in src/hydra.sql at line 97 [13.1]

B:BD[7.5110] → [7.5110:5202]

    foreign key   (project, name, nixExprInput) references jobSetInputs(project, job, name)

[7.5110]

[7.5202]

    foreign key   (project, name, nixExprInput) references jobsetInputs(project, job, name)

Replacement in src/hydra.sql at line 101 [13.1]
B:BD[7.5207] → [7.5207:5235]
```
create table jobSetInputs (
```
[7.5207]
[7.5235]
```
create table jobsetInputs (
```

Replacement in src/hydra.sql at line 107 [13.1]

B:BD[6.4054] → [6.4054:4163]

    foreign key   (project, jobset) references jobSets(project, name) on delete cascade -- ignored by sqlite

[6.4054]

[6.4163]

    foreign key   (project, jobset) references jobsets(project, name) on delete cascade -- ignored by sqlite

Replacement in src/hydra.sql at line 111 [13.1]
B:BD[6.4168] → [6.4168:4199]
```
create table jobSetInputAlts (
```
[6.4168]
[6.4199]
```
create table jobsetInputAlts (
```

Replacement in src/hydra.sql at line 124 [13.1]

B:BD[6.4536] → [6.4536:4665]

    foreign key   (project, jobset, input) references jobSetInputs(project, jobset, name) on delete cascade -- ignored by sqlite

[6.4536]

[14.4159]

    foreign key   (project, jobset, input) references jobsetInputs(project, jobset, name) on delete cascade -- ignored by sqlite

Insertion in src/hydra.sql at line 133 [13.1]

[2.5793]

[14.4340]


    busy          integer not null, -- true means someone is building this job now
    locker        text not null, -- !!! hostname/pid of the process building this job?

Replacement in src/hydra.sql at line 139 [13.1]

B:BD[14.4427] → [14.4427:4479]

    jobSet        text not null, -- !!! foreign key

[14.4427]

[14.4479]

    jobset        text not null, -- !!! foreign key

Replacement in src/hydra.sql at line 146 [13.1]

B:BD[14.4636] → [14.4636:4668]

    system        text not null

[14.4636]

[7.5642]

    system        text not null,
    foreign key   (project) references projects(name), -- ignored by sqlite
    foreign key   (project, jobset) references jobsets(project, name) -- ignored by sqlite

Replacement in src/scheduler.pl at line 19 [13.1319]

B:BD[7.5777] → [6.4666:4751]

    my ($project, $jobset, $jobName, $drvPath, $outPath, $usedInputs, $system) = @_;

[7.5777]

[13.1492]

    my ($project, $jobset, $jobName, $description, $drvPath, $outPath, $usedInputs, $system) = @_;

Insertion in src/scheduler.pl at line 61 [13.1319]
[7.6366]
[7.6366]
```
            , description => $description
```

Replacement in src/scheduler.pl at line 179 [13.1319]

B:BD[15.699] → [15.699:763]

    my $info = XMLin($infoXml, KeyAttr => ['attrPath', 'name'])

[15.699]

[15.763]

    my $info = XMLin($infoXml, ForceArray => 1, KeyAttr => ['attrPath', 'name'])

Replacement in src/scheduler.pl at line 182 [13.1319]

B:BD[15.806] → [15.806:893]

    my $job = $info->{item};
    die if !defined $job || $job->{attrPath} ne $jobName;

[15.806]

[15.893]

    my $job = $info->{item}->{$jobName};
    die if !defined $job;

Replacement in src/scheduler.pl at line 189 [13.1319]

B:BD[15.1085] → [15.1085:1176]

    buildJob($project, $jobset, $jobName, $drvPath, $outPath, $inputInfo, $job->{system});

[15.1085]

[15.1176]

    buildJob($project, $jobset, $jobName, $description, $drvPath, $outPath, $inputInfo, $job->{system});