grahamc/hydra2 - Change E6IC7YIKCWI3LIG3DK7VTACIKCMMQWCOYROXXZL5FYHUWJ7CPN4AC

* Release sets: need to include the jobset name to disambiguate

between jobs with the same name from different jobsets (e.g. trunk vs. branch).

Created by Eelco Dolstra on March 14, 2009

E6IC7YIKCWI3LIG3DK7VTACIKCMMQWCOYROXXZL5FYHUWJ7CPN4AC

Dependencies

In channels

main

Change contents

Insertion in src/lib/Hydra/Controller/Root.pm at line 119 [5.804]

[4.495]


        $name =~ /^(\w+):(\w+)$/ or error($c, "Invalid job name: $name");
        my $jobsetName = $1;
        my $jobName = $2;

Replacement in src/lib/Hydra/Controller/Root.pm at line 124 [5.804]

B:BD[4.496] → [6.0:63]

        die "Invalid job name: $name" unless $name =~ /^\w+$/;

[4.496]

[6.63]

        error($c, "Jobset `$jobsetName' doesn't exist.")
            unless $releaseSet->project->jobsets->find({name => $jobsetName});
        # !!! We could check whether the job exists, but that would
        # require the scheduler to have seen the job, which may not be
        # the case.

Replacement in src/lib/Hydra/Controller/Root.pm at line 132 [5.804]

B:BD[4.541] → [4.541:568]

            { job => $name

[4.541]

[4.568]

            { jobset => $jobsetName
            , job => $jobName

Replacement in src/lib/Hydra/Helper/Nix.pm at line 127 [8.436]

B:BD[7.1530] → [3.48:114]

        { job => $primaryJob->get_column('job'), finished => 1 },

[7.1530]

[7.1587]

        { jobset => $primaryJob->get_column('jobset'), job => $primaryJob->get_column('job'), finished => 1 },

Replacement in src/lib/Hydra/Helper/Nix.pm at line 157 [8.436]

B:BD[7.2478] → [3.115:182]

                { job => $job->get_column('job'), finished => 1 },

[7.2478]

[7.2536]

                { jobset => $job->get_column('jobset'), job => $job->get_column('job'), finished => 1 },

Replacement in src/root/edit-releaseset.tt at line 17 [9.1873]

∅:D[2.79] → [6.474:614]

B:BD[6.474] → [6.474:614]

    <td><input type="text" class="string" [% HTML.attributes(id => "$baseName-name", name => "$baseName-name", value => job.job) %] /></td>

[2.79]

[6.614]

    <td><input type="text" class="string" [% HTML.attributes(id => "$baseName-name", name => "$baseName-name", value => "$job.jobset:$job.job") %] /></td>

Replacement in src/sql/hydra.sql at line 46 [11.1]

B:BD[10.2312] → [10.2312:2407]

    disabled      integer not null default 0, -- true means hold this job until its re-enabled

[10.2312]

[12.2510]

    disabled      integer not null default 0,

Insertion in src/sql/hydra.sql at line 271 [11.1]
[3.7353]
[3.7353]
```
    disabled      integer not null default 0,
```