Jobset eval page: Fix handling of aborted/cancelled builds

[?]
Jan 15, 2014, 3:06 PM
JWFZGHKPRS2JUAUQT7MRXMDPZOFBCJM4BRFT5D3WC7M6Y5JY5CVQC

Dependencies

  • [2] EAN5HLLR Jobset eval page: Show all aborted builds under the "aborted jobs" tab
  • [3] WZZOOYCH Show queued builds in jobset evaluation pages
  • [4] DE2DNCOI Allow comparing an evaluation with an arbitrary other evaluation
  • [5] RHUAFTJA Show aborted/cancelled builds separately in jobset eval pages
  • [6] U4TD3AIQ Add support for viewing jobset evaluations
  • [7] L7NUCXKS Show new and removed jobs
  • [8] K7V2CCD7 Fix an uninitialized value warning

Change contents

  • replacement in src/lib/Hydra/Controller/JobsetEval.pm at line 85
    [3.2660][2.0:173]()
    if ($build->finished != 0 && ($build->buildstatus == 3 || $build->buildstatus == 4)) {
    push @{$c->stash->{aborted}}, $build;
    next;
    }
    [3.2660]
    [3.2660]
    my $aborted = $build->finished != 0 && ($build->buildstatus == 3 || $build->buildstatus == 4);
  • replacement in src/lib/Hydra/Controller/JobsetEval.pm at line 95
    [3.1558][2.174:245]()
    if ($build->finished == 0 || $build2->finished == 0) {
    [3.1558]
    [3.106]
    if ($aborted) {
    # do nothing
    } elsif ($build->finished == 0 || $build2->finished == 0) {
  • replacement in src/lib/Hydra/Controller/JobsetEval.pm at line 113
    [3.3840][3.1559:1612]()
    push @{$c->stash->{new}}, $build if !$found;
    [3.3840]
    [3.3840]
    if ($aborted) {
    push @{$c->stash->{aborted}}, $build;
    } else {
    push @{$c->stash->{new}}, $build if !$found;
    }