grahamc/hydra - Change GNIEG2GCT6BUYHY2WXUAQVKHSYB6TVQT52O5GEY6COLKFK4ODCCQC

* Disambiguate jobs by jobset name. I.e. jobs with the same name in

different jobsets are not considered the same job.

Created by Eelco Dolstra on March 12, 2009

GNIEG2GCT6BUYHY2WXUAQVKHSYB6TVQT52O5GEY6COLKFK4ODCCQC

Dependencies

In channels

main

upstream

Change contents

Replacement in src/lib/Hydra/Controller/Job.pm at line 10 [3.46]

B:BD[3.214] → [3.214:320]

sub job : Chained('/project/project') PathPart('job') CaptureArgs(1) {
    my ($self, $c, $jobName) = @_;

[3.214]

[3.320]

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.");

Insertion in src/lib/Hydra/Controller/Job.pm at line 17 [3.46]

[3.321]

    $c->stash->{curProject} = $project;
    
    $c->stash->{jobset} = $project->jobsets->find({name => $jobsetName})
        or notFound($c, "Jobset $jobsetName doesn't exist.");

Deletion in src/lib/Hydra/Controller/Job.pm at line 23 [3.46]
B:BD[3.358] → [3.358:427]
```
    # !!! nothing to do here yet, since we don't have a jobs table.
```

Replacement in src/lib/Hydra/Controller/Job.pm at line 36 [3.46]

B:BD[3.714] → [2.0:80]

        $c->stash->{curProject}->builds->search({job => $c->stash->{jobName}});

[3.714]

[3.799]

        $c->stash->{jobset}->builds->search({job => $c->stash->{jobName}});

Replacement in src/lib/Hydra/Controller/Project.pm at line 13 [4.1245]

B:BD[4.1566] → [4.1566:1712]

    my $project = $c->model('DB::Projects')->find($projectName);
    notFound($c, "Project $projectName doesn't exist.") unless defined $project;

[4.1566]

[4.1712]

    my $project = $c->model('DB::Projects')->find($projectName)
        or notFound($c, "Project $projectName doesn't exist.");

Replacement in src/lib/Hydra/Schema/BuildInputs.pm at line 39 [5.1]

B:BD[5.782] → [2.413:555]

# Created by DBIx::Class::Schema::Loader v0.04005 @ 2009-03-12 14:55:11
# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:CLL7aeJ0fe0NX3LCnNs4/A

[5.782]

[5.924]

# Created by DBIx::Class::Schema::Loader v0.04005 @ 2009-03-12 17:44:15
# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:9gWr8DPEeH2BjoHT3nt0Lw

Replacement in src/lib/Hydra/Schema/BuildProducts.pm at line 38 [6.4268]

B:BD[6.4922] → [2.556:698]

# 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

[6.4922]

[6.5064]

# Created by DBIx::Class::Schema::Loader v0.04005 @ 2009-03-12 17:44:15
# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:GsPyt1OUQHWN6z7mSpNW2g

Replacement in src/lib/Hydra/Schema/BuildResultInfo.pm at line 38 [7.1594]

B:BD[7.2382] → [2.699:841]

# Created by DBIx::Class::Schema::Loader v0.04005 @ 2009-03-12 14:55:11
# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:ieF3JOI4N3XZUyMboZhrjg

[7.2382]

[7.2524]

# Created by DBIx::Class::Schema::Loader v0.04005 @ 2009-03-12 17:44:15
# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:zIpamqoL0AxNFDpQ/W1TVg

Replacement in src/lib/Hydra/Schema/BuildSchedulingInfo.pm at line 30 [7.3773]

B:BD[7.4473] → [2.905:1047]

# Created by DBIx::Class::Schema::Loader v0.04005 @ 2009-03-12 14:55:11
# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:oomDjaTJHIQjraUqhzFPsg

[7.4473]

[7.4615]

# Created by DBIx::Class::Schema::Loader v0.04005 @ 2009-03-12 17:44:15
# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:McWRZEMJtjFIcR4LplCc9A

Replacement in src/lib/Hydra/Schema/BuildSteps.pm at line 38 [8.1675]

B:BD[8.2959] → [2.1188:1330]

# Created by DBIx::Class::Schema::Loader v0.04005 @ 2009-03-12 14:55:11
# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:+nb1zsYcv9WziZ6IHcc/yw

[8.2959]

# Created by DBIx::Class::Schema::Loader v0.04005 @ 2009-03-12 17:44:15
# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:zuyAJq4T5Ynsq920Pd7hLg

Replacement in src/lib/Hydra/Schema/Builds.pm at line 79 [6.5202]

B:BD[6.6194] → [2.1378:1520]

# Created by DBIx::Class::Schema::Loader v0.04005 @ 2009-03-12 14:55:11
# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:UahvxjBmn7b70IK+QcnKHA

[6.6194]

[7.3377]

# Created by DBIx::Class::Schema::Loader v0.04005 @ 2009-03-12 17:44:15
# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:6taCYZNB0HaY+fvDjUhrYQ

Replacement in src/lib/Hydra/Schema/CachedPathInputs.pm at line 25 [9.859]

B:BD[9.1497] → [2.1521:1663]

# Created by DBIx::Class::Schema::Loader v0.04005 @ 2009-03-12 14:55:11
# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:+AZEuCFAfkl7SKwlxDBnaw

[9.1497]

[9.1639]

# Created by DBIx::Class::Schema::Loader v0.04005 @ 2009-03-12 17:44:15
# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:Jhu1KxMfSF1Y1b4VGUqTzg

Replacement in src/lib/Hydra/Schema/CachedSubversionInputs.pm at line 23 [9.1780]

B:BD[9.2342] → [2.1664:1806]

# Created by DBIx::Class::Schema::Loader v0.04005 @ 2009-03-12 14:55:11
# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:2JtWOkH5OVGl7Cb7STLM5Q

[9.2342]

[9.2484]

# 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

Replacement in src/lib/Hydra/Schema/JobsetInputAlts.pm at line 34 [10.825]

B:BD[10.1831] → [2.1807:1949]

# Created by DBIx::Class::Schema::Loader v0.04005 @ 2009-03-12 14:55:11
# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:ka/dxG48LaZOQeShZFs0Hw

[10.1831]

[10.1973]

# Created by DBIx::Class::Schema::Loader v0.04005 @ 2009-03-12 17:44:15
# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:fBv361MRwuWvAJQnOLZDIw

Replacement in src/lib/Hydra/Schema/JobsetInputs.pm at line 25 [11.590]
B:BD[11.1421] → [11.1421:1463]
```
    "foreign.name"         => "self.job",
```
[11.1421]
[11.1463]
```
    "foreign.name"         => "self.jobset",
```

Replacement in src/lib/Hydra/Schema/JobsetInputs.pm at line 46 [11.590]

B:BD[11.1681] → [2.1950:2092]

# 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

[11.1681]

[11.1823]

# Created by DBIx::Class::Schema::Loader v0.04005 @ 2009-03-12 17:44:15
# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:S8AQqv8/GkLkXpPutV4N0A

Replacement in src/lib/Hydra/Schema/Jobsets.pm at line 41 [11.1960]
∅:D[12.2812] → [11.2762:2829]
∅:D[13.3317] → [11.2762:2829]
B:BD[11.2762] → [11.2762:2829]
```
  { job => "name", name => "nixexprinput", project => "project" },
```
[12.2812]
[11.2829]
```
  { jobset => "name", name => "nixexprinput", project => "project" },
```

Replacement in src/lib/Hydra/Schema/Jobsets.pm at line 53 [11.1960]

B:BD[11.2992] → [2.2093:2235]

# Created by DBIx::Class::Schema::Loader v0.04005 @ 2009-03-12 14:55:11
# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:ADLNgkS2YPv4DuszwHau7g

[11.2992]

[11.3134]

# Created by DBIx::Class::Schema::Loader v0.04005 @ 2009-03-12 17:44:15
# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:xYDUCEXRPeVdFJBQnG/Wog

Replacement in src/lib/Hydra/Schema/Projects.pm at line 48 [11.3266]

B:BD[11.3685] → [2.2236:2378]

# 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

[11.3685]

[11.3827]

# Created by DBIx::Class::Schema::Loader v0.04005 @ 2009-03-12 17:44:15
# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:9ZqA/21u40pt4t85YrYbeg

Replacement in src/lib/Hydra/Schema/ReleaseSetJobs.pm at line 37 [14.5076]

B:BD[14.6070] → [2.2452:2594]

# Created by DBIx::Class::Schema::Loader v0.04005 @ 2009-03-12 14:55:11
# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:OM2joIa3Bj6t9BhVrOjN8Q

[14.6070]

[14.6212]

# Created by DBIx::Class::Schema::Loader v0.04005 @ 2009-03-12 17:44:15
# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:Ta71pOzVsej/w0FoHIUMbg

Replacement in src/lib/Hydra/Schema/ReleaseSets.pm at line 32 [14.6351]

B:BD[14.7142] → [2.2595:2737]

# Created by DBIx::Class::Schema::Loader v0.04005 @ 2009-03-12 14:55:11
# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:gSzri22yKGHLKCjNLv9/VQ

[14.7142]

[14.7284]

# Created by DBIx::Class::Schema::Loader v0.04005 @ 2009-03-12 17:44:15
# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:0DtIgm5jznjy1l3809b06Q

Replacement in src/lib/Hydra/Schema/SystemTypes.pm at line 19 [15.1717]

B:BD[15.2105] → [2.2738:2880]

# Created by DBIx::Class::Schema::Loader v0.04005 @ 2009-03-12 14:55:11
# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:viZlvDAHk9k8ScuA/qfUGw

[15.2105]

[15.2247]

# Created by DBIx::Class::Schema::Loader v0.04005 @ 2009-03-12 17:44:15
# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:WUSl5Uivcl6E1KLxiq+89A

Replacement in src/lib/Hydra/Schema/UserRoles.pm at line 20 [16.3263]

B:BD[16.3736] → [2.2881:3023]

# Created by DBIx::Class::Schema::Loader v0.04005 @ 2009-03-12 14:55:11
# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:gRuZJKELtc15+vQFjxjkKQ

[16.3736]

[16.3878]

# Created by DBIx::Class::Schema::Loader v0.04005 @ 2009-03-12 17:44:15
# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:x/HXSH7s3bgPJSLK71hV9w

Replacement in src/lib/Hydra/Schema/Users.pm at line 33 [17.3258]

B:BD[17.3782] → [2.3024:3166]

# Created by DBIx::Class::Schema::Loader v0.04005 @ 2009-03-12 14:55:11
# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:Lomf54EURbBIbrWGojiFIw

[17.3782]

[17.3924]

# Created by DBIx::Class::Schema::Loader v0.04005 @ 2009-03-12 17:44:15
# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:uP86PxN/ZWgy5PRVU7Qgow

Replacement in src/lib/Hydra/Schema.pm at line 11 [6.6376]

B:BD[6.6498] → [2.3167:3309]

# Created by DBIx::Class::Schema::Loader v0.04005 @ 2009-03-12 14:55:11
# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:oeLeU2T8C2dVBS+ugF0p8g

[6.6498]

[6.6640]

# Created by DBIx::Class::Schema::Loader v0.04005 @ 2009-03-12 17:44:15
# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:oIv4qqdjLKRDgAYXHHTz8A

Replacement in src/root/all.tt at line 5 [18.1038]

B:BD[3.956] → [3.956:1028]

  [% IF jobName %]for Job [% curProject.name %]:[% jobName %][% ELSE %]

[3.956]

[3.1028]

  [% IF jobName %]for Job [% curProject.name %]:[% jobset.name %]:[% jobName %][% ELSE %]

Insertion in src/root/build.tt at line 5 [6.7350]

[19.1440]

[6.7413]


[% project = build.get_column('project') %]
[% jobset = build.get_column('jobset') %]
[% job = build.get_column('job') %]

Replacement in src/root/build.tt at line 11 [6.7350]

B:BD[7.5620] → [2.3310:3381]

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

[7.5620]

[7.5696]

  Job <tt>[% project %]:[% jobset %]:[% job %]</tt> build [% id %]

Replacement in src/root/build.tt at line 80 [6.7350]

B:BD[20.451] → [21.2821:2929]

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

[20.451]

[20.493]

    <td>[% PROCESS renderProjectName %]</td>

Replacement in src/root/build.tt at line 84 [6.7350]
B:BD[20.529] → [21.2930:2976]
```
    <td><tt>[% build.jobset.name %]</tt></td>
```
[20.529]
[6.7527]
```
    <td>[% PROCESS renderJobsetName %]</td>
```

Replacement in src/root/build.tt at line 88 [6.7350]

B:BD[6.7565] → [2.3521:3636]

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

[6.7565]

[22.2225]

    <td>[% PROCESS renderJobName %]</td>

Insertion in src/root/build.tt at line 111 [6.7350]

[23.3189]

[6.7673]

  </tr>
  <tr>
    <th>Homepage:</th>
    <td>[% IF build.homepage %]<a [% HTML.attributes(href => build.homepage) %]>[% HTML.escape(build.homepage) %]</a>[% ELSE %]<em>(not given)</em>[% END %]</td>

Insertion in src/root/common.tt at line 19 [25.2803]

[24.707]


[% BLOCK renderProjectName -%]
<a href="[% c.uri_for('/project' project) %]"><tt>[% project %]</tt></a>[% END -%]
[% BLOCK renderJobsetName -%]
<a href="[% c.uri_for('/jobset' project jobset) %]"><tt>[% jobset %]</tt></a>[% END -%]

Insertion in src/root/common.tt at line 29 [25.2803]

[24.708]

[% BLOCK renderJobName -%]
<a href="[% c.uri_for('/job' project jobset job) %]"><tt>[% job %]</tt></a>[% END -%]

Insertion in src/root/common.tt at line 32 [25.2803]

[24.709]


[% BLOCK renderFullJobName %]
  <tt>
  [% PROCESS renderProjectName %]:[% PROCESS renderJobsetName %]:[% PROCESS renderJobName %]
  </a>
[% END %]

Deletion in src/root/common.tt at line 51 [25.2803]
B:BD[24.962] → [24.962:987]
```
        <th>Project</th>
```
Replacement in src/root/common.tt at line 52 [25.2803]
B:BD[24.1008] → [26.284:306]
```
        <th>Name</th>
```
[24.1008]
[24.1008]
```
        <th>Release Name</th>
```

Replacement in src/root/common.tt at line 81 [25.2803]

B:BD[24.1746] → [27.897:1029]

B:BD[27.1029] → [2.3984:4114]

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

[24.1746]

[26.307]

          <td>
            [% PROCESS renderFullJobName project=build.get_column("project") jobset = build.get_column("jobset") job = build.job %]
          </td>

Insertion in src/script/hydra_scheduler.pl at line 238 [29.1319]
[28.1125]
[28.1125]
```
            , homepage => $job->{homepage}
```

Replacement in src/sql/hydra.sql at line 203 [29.1]

B:BD[7.10964] → [7.10964:11056]

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

[7.10964]

[11.5202]

    foreign key   (project, name, nixExprInput) references JobsetInputs(project, jobset, name)