grahamc/hydra - Change ZILILXXKP4Z64UGIXIPTQ3KXPV76LFGSXVFLMLCO2HJBCQ5GP6AQC

* Allow scheduled builds to be cancelled. They're not removed from

the database, just marked as cancelled, because otherwise the scheduler would just add them again.

Created by Eelco Dolstra on March 6, 2009

ZILILXXKP4Z64UGIXIPTQ3KXPV76LFGSXVFLMLCO2HJBCQ5GP6AQC

Dependencies

In channels

main

upstream

Change contents

Replacement in src/lib/Hydra/Controller/Build.pm at line 33 [5.1]

B:BD[4.61] → [3.0:55]

    $c->stash->{flashMsg} = $c->flash->{afterRestart};

[4.61]

[5.941]

    $c->stash->{flashMsg} = $c->flash->{buildMsg};

Replacement in src/lib/Hydra/Controller/Build.pm at line 159 [5.1]

B:BD[3.60] → [3.60:121]

sub restart : Chained('build') PathPart('restart') Args(0) {

[3.60]

[3.121]

sub restart : Chained('build') PathPart Args(0) {

Deletion in src/lib/Hydra/Controller/Build.pm at line 165 [5.1]

B:BD[3.230] → [3.230:353]


    error($c, "This build cannot be restarted.")
        unless $build->finished && $build->resultInfo->buildstatus == 3;

Insertion in src/lib/Hydra/Controller/Build.pm at line 167 [5.1]

[3.396]

        error($c, "This build cannot be restarted.")
            unless $build->finished &&
              ($build->resultInfo->buildstatus == 3 ||
               $build->resultInfo->buildstatus == 4);

Replacement in src/lib/Hydra/Controller/Build.pm at line 186 [5.1]

B:BD[3.757] → [3.757:818]

    $c->flash->{afterRestart} = "Build has been restarted.";

[3.757]

[3.818]

    $c->flash->{buildMsg} = "Build has been restarted.";
    
    $c->res->redirect($c->uri_for($self->action_for("view_build"), $c->req->captures));
}
sub cancel : Chained('build') PathPart Args(0) {
    my ($self, $c) = @_;
    my $build = $c->stash->{build};
    requireProjectOwner($c, $build->project);
    $c->model('DB')->schema->txn_do(sub {
        error($c, "This build cannot be cancelled.")
            if $build->finished || $build->schedulingInfo->busy;
        # !!! Actually, it would be nice to be able to cancel busy
        # builds as well, but we would have to send a signal or
        # something to the build process.
        $build->finished(1);
        $build->timestamp(time());
        $build->update;
        $c->model('DB::BuildResultInfo')->create(
            { id => $build->id
            , iscachedbuild => 0
            , buildstatus => 4 # = cancelled
            });
        $build->schedulingInfo->delete;
    });
    $c->flash->{buildMsg} = "Build has been cancelled.";

Insertion in src/root/build.tt at line 43 [8.7350]

[6.2351]

[7.665]

        [% ELSIF build.resultInfo.buildstatus == 4 %]
          <img src="/static/images/failure.gif" alt="Failed" />
          <span class="error">Cancelled by user</span>

Insertion in src/root/build.tt at line 50 [8.7350]

[6.2449]

[3.1781]

        [% END %]
        [% IF build.resultInfo.buildstatus == 3 || build.resultInfo.buildstatus == 4 %]

Replacement in src/root/build.tt at line 53 [8.7350]

B:BD[3.1881] → [3.1881:1952]

            <button id="delete-project" type="submit">Restart</button>

[3.1881]

[3.1952]

            <button id="restart" type="submit">Restart</button>

Insertion in src/root/build.tt at line 61 [8.7350]

[7.944]

        [% IF c.user_exists %]
          <form action="[% c.uri_for('/build' build.id 'cancel') %]" method="post" class="inline">
            <button id="cancel" type="submit">Cancel</button>
          </form>
        [% END %]

Deletion in src/root/build.tt at line 128 [8.7350]
B:BD[2.275] → [2.275:283]
∅:D[2.283] → [9.6113:6139]
B:BD[10.1478] → [9.6113:6139]
∅:D[9.6139] → [10.1478:1485]
B:BD[10.1478] → [10.1478:1485]
B:BD[10.1485] → [11.0:28]
B:BD[11.28] → [12.4807:4965]
∅:D[13.3826] → [11.97:141]
∅:D[12.4965] → [11.97:141]
∅:D[9.6297] → [11.97:141]
B:BD[11.97] → [11.97:141]
B:BD[11.141] → [12.4966:5122]
∅:D[13.3960] → [11.209:224]
∅:D[12.5122] → [11.209:224]
∅:D[9.6453] → [11.209:224]
B:BD[11.209] → [11.209:224]
∅:D[11.224] → [10.1485:1527]
B:BD[10.1485] → [10.1485:1527]
B:BD[10.1527] → [9.6454:6500]
∅:D[9.6500] → [10.1562:1611]
B:BD[10.1562] → [10.1562:1611]
B:BD[10.1611] → [9.6501:6570]
B:BD[11.423] → [11.423:449]
```
 </tr>
 [% IF build.finished %]
 <tr>
 <th>Build started:</th>
 <td>[% IF build.resultInfo.starttime %][% PROCESS renderDateTime timestamp = build.resultInfo.starttime %][% ELSE %](cached build)[% END %]</td>
 </tr>
 <tr>
 <th>Build finished:</th>
 <td>[% IF build.resultInfo.stoptime %][% PROCESS renderDateTime timestamp = build.resultInfo.stoptime %][% ELSE %](cached build)[% END %]</td>
 </tr>
 <tr>
 <th>Duration (seconds):</th>
 <td>
 [% IF build.resultInfo.iscachedbuild %]
 (cached build)
 [% ELSE %]
 [% build.resultInfo.stoptime - build.resultInfo.starttime %]
 [% END %]
 </td>
```

Replacement in src/root/build.tt at line 129 [8.7350]

∅:D[14.2327] → [6.2450:2486]

B:BD[9.6629] → [6.2450:2486]

  [% IF build.resultInfo.logfile %]

[9.6629]

[6.2486]

  [% IF build.finished && build.resultInfo.buildstatus != 4 %]
    <tr>
      <th>Build started:</th>
      <td>[% IF build.resultInfo.starttime %][% PROCESS renderDateTime timestamp = build.resultInfo.starttime %][% ELSE %]<em>(cached build)</em>[% END %]</td>
    </tr>
    <tr>
      <th>Build finished:</th>
      <td>[% IF build.resultInfo.stoptime %][% PROCESS renderDateTime timestamp = build.resultInfo.stoptime %][% ELSE %]<em>(cached build)</em>[% END %]</td>
    </tr>

Replacement in src/root/build.tt at line 139 [8.7350]
B:BD[6.2495] → [6.2495:2519]
```
 <th>Logfile:</th>
```
[6.2495]
[6.2519]
```
 <th>Duration (seconds):</th>
```

Replacement in src/root/build.tt at line 141 [8.7350]

B:BD[6.2530] → [5.3832:3922]

        <a href="[% c.uri_for('/build' build.id 'log') %]"><strong>Available</strong></a>

[6.2530]

[6.2612]

        [% IF build.resultInfo.iscachedbuild %]
          <em>(cached build)</em>
        [% ELSE %]
          [% build.resultInfo.stoptime - build.resultInfo.starttime %]
        [% END %]

Insertion in src/root/build.tt at line 148 [8.7350]

[6.2634]

    [% IF build.resultInfo.logfile %]
      <tr>
        <th>Logfile:</th>
        <td>
          <a href="[% c.uri_for('/build' build.id 'log') %]"><strong>Available</strong></a>
        </td>
      </tr>
    [% END %]

Replacement in src/root/build.tt at line 157 [8.7350]

∅:D[6.2646] → [9.6629:6721]

B:BD[9.6629] → [9.6629:6721]

∅:D[11.449] → [8.7964:7972]

∅:D[9.6721] → [8.7964:7972]

B:BD[8.7964] → [8.7964:7972]

B:BD[8.7972] → [7.971:1037]

B:BD[7.1037] → [15.2306:2363]

∅:D[15.2363] → [7.1085:1093]

B:BD[7.1085] → [7.1085:1093]

  [% ELSE %]
  <tr>
    <th>Priority:</th>
    <td>[% build.schedulingInfo.priority %]</td>
  </tr>
  [% IF build.schedulingInfo.busy %]
  <tr>
    <th>Logfile:</th>
    <td><tt>[% build.schedulingInfo.logfile %]</tt></td>
  </tr>

[6.2646]

[9.6722]

  [% IF !build.finished %]
    <tr>
      <th>Priority:</th>
      <td>[% build.schedulingInfo.priority %]</td>
    </tr>
    [% IF build.schedulingInfo.busy %]
    <tr>
      <th>Logfile:</th>
      <td><tt>[% build.schedulingInfo.logfile %]</tt></td>
    </tr>
    [% END %]

Deletion in src/root/build.tt at line 169 [8.7350]
B:BD[9.6734] → [7.1094:1106]
```
  [% END %]
```

Insertion in src/sql/hydra.sql at line 64 [16.1]

[6.4847]

    --   4 = build cancelled (removed from queue; never built)