grahamc/hydra - Change PMNWRTGJ4GVSMSSAWSUD57B26PCRAHMZIQ5SIWJIK7A74ENKEQLAC

Add multiple output support

This requires turning the outPath columns in the Builds and BuildSteps tables into separate tables, and so requires a schema upgrade.

Created by Eelco Dolstra on February 13, 2013

PMNWRTGJ4GVSMSSAWSUD57B26PCRAHMZIQ5SIWJIK7A74ENKEQLAC

Dependencies

In channels

main

upstream

Change contents

Insertion in src/c/hydra-eval-jobs.cc at line 125 [15.303]

[13.55]

[14.747]


            DrvInfo::Outputs outputs = drv.queryOutputs(state);

Deletion in src/c/hydra-eval-jobs.cc at line 132 [15.303]
∅:D[13.125] → [16.217:276]
B:BD[16.217] → [16.217:276]
```
            xmlAttrs["outPath"] = drv.queryOutPath(state);
```

Insertion in src/c/hydra-eval-jobs.cc at line 168 [15.303]

[14.1148]

[17.378]


            foreach (DrvInfo::Outputs::iterator, j, outputs) {
                XMLAttrs attrs2;
                attrs2["name"] = j->first;
                attrs2["path"] = j->second;
                doc.writeEmptyElement("output", attrs2);
            }

Replacement in src/lib/Hydra/Base/Controller/ListBuilds.pm at line 81 [19.1]

B:BD[18.186] → [18.186:301]

                ->search({}, { columns => [@buildListColumns, 'drvpath', 'outpath', 'description', 'homepage'] });

[18.186]

[20.577]

                ->search({}, { join => ["buildoutputs"]
                             , columns => [@buildListColumns, 'drvpath', 'description', 'homepage']
                             , '+select' => ['buildoutputs.path', 'buildoutputs.name'], '+as' => ['outpath', 'outname'] });

Insertion in src/lib/Hydra/Base/Controller/NixChannel.pm at line 6 [21.43]
[19.1060]
[18.302]
```
use List::MoreUtils qw(all);
```
Insertion in src/lib/Hydra/Base/Controller/NixChannel.pm at line 16 [21.43]
[18.402]
[18.402]
```
    $c->stash->{nixPkgs} = [];
```

Replacement in src/lib/Hydra/Base/Controller/NixChannel.pm at line 18 [21.43]

B:BD[18.460] → [18.460:1045]

        next if $checkValidity && !isValidPath($build->outpath);
        #if (isValidPath($build->drvpath)) {
        #    # Adding `drvpath' implies adding `outpath' because of the
        #    # `--include-outputs' flag passed to `nix-store'.
        #    push @storePaths, $build->drvpath;
        #} else {
        #    push @storePaths, $build->outpath;
        #}
        push @storePaths, $build->outpath;
        my $pkgName = $build->nixname . "-" . $build->system . "-" . $build->id;
        $c->stash->{nixPkgs}->{"${pkgName}.nixpkg"} = {build => $build, name => $pkgName};

[18.460]

[18.1045]

        my $outPath = $build->get_column("outpath");
        my $outName = $build->get_column("outname");
        next if $checkValidity && !isValidPath($outPath);
        push @storePaths, $outPath;
        my $pkgName = $build->nixname . "-" . $build->system . "-" . $build->id . ($outName ne "out" ? "-" . $outName : "");
        push @{$c->stash->{nixPkgs}}, { build => $build, name => $pkgName, outPath => $outPath, outName => $outName };

Replacement in src/lib/Hydra/Base/Controller/NixChannel.pm at line 29 [21.43]

B:BD[18.1345] → [18.1345:1417]

        $c->stash->{systemForPath}->{$build->outpath} = $build->system;

[18.1345]

[18.1417]

        $c->stash->{systemForPath}->{$outPath} = $build->system;

Insertion in src/lib/Hydra/Base/Controller/NixChannel.pm at line 32 [21.43]
[21.204]
[18.1425]
```
    print STDERR @storePaths, "\n";
```
Insertion in src/lib/Hydra/Base/Controller/NixChannel.pm at line 42 [21.43]
[18.1502]
[18.1502]
```
    # FIXME: get the closure of the selected path only.
```

Insertion in src/lib/Hydra/Base/Controller/NixChannel.pm at line 65 [21.43]

[18.1639]

        # FIXME: need to handle multiple outputs: channelBuilds is
        # joined with the build outputs, so find() can return multiple
        # results.

Replacement in src/lib/Hydra/Base/Controller/NixChannel.pm at line 72 [21.43]

B:BD[22.133] → [18.1787:1840]

    if (!isValidPath($c->stash->{build}->outpath)) {

[22.133]

[18.1840]

    unless (all { isValidPath($_->path) } $c->stash->{build}->buildoutputs->all) {

Replacement in src/lib/Hydra/Base/Controller/NixChannel.pm at line 121 [21.43]

B:BD[23.279] → [24.207:279]

    $c->stash->{nixPkgs} = [sortPkgs (values %{$c->stash->{nixPkgs}})];

[23.279]

[23.399]

    $c->stash->{nixPkgs} = [sortPkgs @{$c->stash->{nixPkgs}}];

Insertion in src/lib/Hydra/Controller/Build.pm at line 13 [27.1]
[25.31]
[26.73]
```
use List::MoreUtils qw(all);
```

Insertion in src/lib/Hydra/Controller/Build.pm at line 33 [27.1]

[28.56]

[27.682]

}
sub findBuildStepByOutPath {
    my ($self, $c, $path, $status) = @_;
    return $c->model('DB::BuildSteps')->search(
        { path => $path, busy => 0, status => $status },
        { join => ["buildstepoutputs"], order_by => ["stopTime"], limit => 1 })->single;

Insertion in src/lib/Hydra/Controller/Build.pm at line 44 [27.1]

[27.685]

[27.686]

sub findBuildStepByDrvPath {
    my ($self, $c, $drvPath, $status) = @_;
    return $c->model('DB::BuildSteps')->search(
        { drvpath => $drvPath, busy => 0, status => $status },
        { order_by => ["stopTime"], limit => 1 })->single;
}

Replacement in src/lib/Hydra/Controller/Build.pm at line 58 [27.1]

B:BD[27.883] → [27.883:941]

    $c->stash->{available} = isValidPath $build->outpath;

[27.850]

[29.0]

    $c->stash->{available} = all { isValidPath($_->path) } $build->buildoutputs->all;

Deletion in src/lib/Hydra/Controller/Build.pm at line 62 [27.1]
B:BD[30.11] → [31.895:988]
∅:D[32.51] → [27.941:942]
∅:D[33.55] → [27.941:942]
∅:D[29.61] → [27.941:942]
∅:D[30.149] → [27.941:942]
∅:D[31.988] → [27.941:942]
B:BD[27.941] → [27.941:942]
```
    $c->stash->{pathHash} = $c->stash->{available} ? queryPathHash($build->outpath) : undef;
```

Replacement in src/lib/Hydra/Controller/Build.pm at line 67 [27.1]

B:BD[34.3014] → [35.105:210]

        (my $cachedBuildStep) = $c->model('DB::BuildSteps')->search({ outpath => $build->outpath }, {});

[34.3014]

[36.0]

        my $path = ($build->buildoutputs)[0]->path or die;
        my $cachedBuildStep = findBuildStepByOutPath($self, $c, $path,
            $build->buildstatus == 0 || $build->buildstatus == 6 ? 0 : 1);

Replacement in src/lib/Hydra/Controller/Build.pm at line 73 [27.1]
B:BD[37.229] → [34.3150:3178]
```
    if ($build->finished) {
```
[38.272]
[34.3178]
```
    if ($build->finished && 0) {
```

Replacement in src/lib/Hydra/Controller/Build.pm at line 299 [27.1]

B:BD[39.139] → [39.139:258]

    $c->stash->{available} = isValidPath $build->outpath;
    $c->stash->{drvAvailable} = isValidPath $build->drvpath;

[39.139]

[29.1010]

    my $drvPath = $build->drvpath;
    my @outPaths = map { $_->path } $build->buildoutputs->all;

Replacement in src/lib/Hydra/Controller/Build.pm at line 302 [27.1]

B:BD[29.1011] → [39.259:329]

    my $drvpath = $build->drvpath;
    my $outpath = $build->outpath;

[29.1011]

[38.609]

    $c->stash->{available} = all { isValidPath($_) } @outPaths;
    $c->stash->{drvAvailable} = isValidPath $drvPath;

Replacement in src/lib/Hydra/Controller/Build.pm at line 305 [27.1]
∅:D[38.610] → [39.334:363]
B:BD[39.334] → [39.334:363]
```
    my @buildtimepaths = ();
```
[38.610]
[39.363]
```
    my @buildtimepaths = $c->stash->{drvAvailable} ? computeFSClosure(0, 0, $drvPath) : ();
```

Deletion in src/lib/Hydra/Controller/Build.pm at line 307 [27.1]

B:BD[39.391] → [39.391:518]

    @buildtimepaths = split '\n', `nix-store --query --requisites --include-outputs $drvpath` if isValidPath($build->drvpath);

Replacement in src/lib/Hydra/Controller/Build.pm at line 308 [27.1]
∅:D[38.612] → [39.523:550]
B:BD[39.523] → [39.523:550]
```
    my @runtimepaths = ();
```
[38.612]
[39.550]
```
    my @runtimepaths = $c->stash->{available} ? computeFSClosure(0, 0, @outPaths) : ();
```

Deletion in src/lib/Hydra/Controller/Build.pm at line 310 [27.1]

B:BD[39.576] → [39.576:701]

    @runtimepaths = split '\n', `nix-store --query --requisites --include-outputs $outpath` if isValidPath($build->outpath);

Replacement in src/lib/Hydra/Controller/Build.pm at line 312 [27.1]

B:BD[39.744] → [40.1245:1413]

        my $buildStep;
        ($buildStep) = $c->model('DB::BuildSteps')->search({ outpath => $p }, {}) ;
        my %dep = ( buildstep => $buildStep,  path => $p ) ;

[39.744]

[40.1413]

        next unless $p =~ /\.drv$/;
        my ($buildStep) = findBuildStepByDrvPath($self, $c, $p, 0);
        my %dep = ( buildstep => $buildStep, path => $p );

Replacement in src/lib/Hydra/Controller/Build.pm at line 319 [27.1]

B:BD[39.980] → [40.1451:1619]

        my $buildStep;
        ($buildStep) = $c->model('DB::BuildSteps')->search({ outpath => $p }, {}) ;
        my %dep = ( buildstep => $buildStep,  path => $p ) ;

[39.980]

[40.1619]

        my ($buildStep) = findBuildStepByOutPath($self, $c, $p, 0);
        my %dep = ( buildstep => $buildStep, path => $p );

Deletion in src/lib/Hydra/Controller/Build.pm at line 324 [27.1]
B:BD[39.1178] → [38.615:616]

Replacement in src/lib/Hydra/Controller/Build.pm at line 337 [27.1]

∅:D[41.76] → [21.1606:1670]

B:BD[21.1606] → [21.1606:1670]

        if !$build->buildproducts->find({type => "nix-build"});

[41.76]

[21.1670]

        if $build->buildproducts->search({type => "nix-build"})->count == 0;

Replacement in src/lib/Hydra/Controller/Build.pm at line 339 [27.1]

B:BD[21.1671] → [41.77:150]

∅:D[41.150] → [21.1741:1786]

B:BD[21.1741] → [21.1741:1786]

    notFound($c, "Path " . $build->outpath . " is no longer available.")
        unless isValidPath($build->outpath);

[21.1671]

[38.619]

    foreach my $out ($build->buildoutputs) {
        notFound($c, "Path " . $out->path . " is no longer available.")
            unless isValidPath($out->path);
    }

Replacement in src/lib/Hydra/Controller/Build.pm at line 344 [27.1]

∅:D[38.620] → [18.2172:2258]

B:BD[21.1791] → [18.2172:2258]

    $c->stash->{channelBuilds} = $c->model('DB::Builds')->search({id => $build->id});

[38.620]

[33.56]

    $c->stash->{channelBuilds} = $c->model('DB::Builds')->search(
        { id => $build->id },
        { join => ["buildoutputs"]
        , '+select' => ['buildoutputs.path', 'buildoutputs.name'], '+as' => ['outpath', 'outname'] });

Replacement in src/lib/Hydra/Controller/Build.pm at line 398 [27.1]
B:BD[42.205] → [42.205:242]
```
    my ($self, $c, $newStatus) = @_;
```
[42.205]
[42.242]
```
    my ($self, $c, $x) = @_;
    my $keep = $x eq "1" ? 1 : 0;
```

Replacement in src/lib/Hydra/Controller/Build.pm at line 405 [27.1]

B:BD[42.327] → [42.327:378]

    die unless $newStatus == 0 || $newStatus == 1;

[42.327]

[3.0]

    if ($keep) {
        registerRoot $_->path foreach $build->buildoutputs;
    }

Deletion in src/lib/Hydra/Controller/Build.pm at line 409 [27.1]
B:BD[3.1] → [3.1:54]
∅:D[3.54] → [42.378:379]
B:BD[42.378] → [42.378:379]
```
    registerRoot $build->outpath if $newStatus == 1;
```
Replacement in src/lib/Hydra/Controller/Build.pm at line 410 [27.1]
B:BD[43.128] → [34.3388:3438]
```
        $build->update({keep => int $newStatus});
```
[43.128]
[42.483]
```
        $build->update({keep => $keep});
```

Replacement in src/lib/Hydra/Controller/Build.pm at line 414 [27.1]

B:BD[42.520] → [42.520:597]

        $newStatus == 0 ? "Build will not be kept." : "Build will be kept.";

[42.520]

[38.627]

        $keep ? "Build will be kept." : "Build will not be kept.";

Replacement in src/lib/Hydra/Controller/Build.pm at line 436 [27.1]

∅:D[38.634] → [44.2:36]

B:BD[44.2] → [44.2:36]

    registerRoot $build->outpath;

[38.634]

[38.635]

    foreach my $output ($build->buildoutputs) {
        error($c, "This build is no longer available.") unless isValidPath $output->path;
        registerRoot $output->path;
    }

Deletion in src/lib/Hydra/Controller/Build.pm at line 441 [27.1]
∅:D[38.636] → [44.41:129]
B:BD[44.41] → [44.41:129]
∅:D[44.129] → [45.647:648]
B:BD[45.647] → [45.647:648]
```
    error($c, "This build is no longer available.") unless isValidPath $build->outpath;
```

Replacement in src/lib/Hydra/Controller/Build.pm at line 532 [27.1]

B:BD[26.333] → [26.333:381]

    $c->stash->{jsonOutPath} = $build->outpath;

[26.333]

[26.381]

    my $out = $build->buildoutputs->find({name => "out"});
    $c->stash->{jsonOutPath} = $out->path if defined $out;

Replacement in src/lib/Hydra/Controller/JobsetEval.pm at line 144 [47.1302]

B:BD[46.466] → [46.466:606]

        ->search({ finished => 1, buildstatus => 0 }, { columns => [@buildListColumns, 'drvpath', 'outpath', 'description', 'homepage'] });

[46.466]

[47.3916]

        ->search({ finished => 1, buildstatus => 0 },
                 { columns => [@buildListColumns, 'drvpath', 'description', 'homepage']
                 , join => ["buildoutputs"]
                 , '+select' => ['buildoutputs.path', 'buildoutputs.name'], '+as' => ['outpath', 'outname'] });

Insertion in src/lib/Hydra/Helper/AddBuilds.pm at line 16 [49.2663]
[48.16]
[49.2759]
```
use File::Slurp;
```

Replacement in src/lib/Hydra/Helper/AddBuilds.pm at line 47 [49.2663]

B:BD[50.24] → [50.24:25]

∅:D[50.25] → [51.143:374]

B:BD[51.143] → [51.143:374]


    my $releaseName;
    if (-e "$outPath/nix-support/hydra-release-name") {
        open FILE, "$outPath/nix-support/hydra-release-name" or die;
        $releaseName = <FILE>;
        chomp $releaseName;
        close FILE;
    }

[50.24]

[51.374]

    return undef unless -f "$outPath/nix-support/hydra-release-name";
    my $releaseName = read_file("$outPath/nix-support/hydra-release-name");
    chomp $releaseName;

Replacement in src/lib/Hydra/Helper/AddBuilds.pm at line 241 [49.2663]

B:BD[49.9288] → [52.4243:4311]

    if (!defined $prevBuild || !isValidPath($prevBuild->outpath)) {

[49.9288]

[52.4311]

    if (!defined $prevBuild || !isValidPath(getMainOutput($prevBuild)->path)) {

Replacement in src/lib/Hydra/Helper/AddBuilds.pm at line 255 [49.2663]
∅:D[53.234] → [54.219:262]
B:BD[52.4754] → [54.219:262]
```
        { storePath => $prevBuild->outpath
```
[53.234]
[52.4823]
```
        { storePath => getMainOutput($prevBuild)->path
```

Replacement in src/lib/Hydra/Helper/AddBuilds.pm at line 274 [49.2663]

B:BD[52.5249] → [52.5249:5317]

        push(@validBuilds, $build) if isValidPath($build->outpath);

[52.5249]

[52.5317]

        push(@validBuilds, $build) if !isValidPath(getMainOutput($build)->path);

Replacement in src/lib/Hydra/Helper/AddBuilds.pm at line 292 [49.2663]

B:BD[52.5847] → [54.317:364]

            { storePath => $prevBuild->outpath

[52.5847]

[52.5927]

            { storePath => getMainOutput($prevBuild)->path

Insertion in src/lib/Hydra/Helper/AddBuilds.pm at line 664 [49.2663]
[55.2105]
[56.1359]

Replacement in src/lib/Hydra/Helper/AddBuilds.pm at line 742 [49.2663]

B:BD[56.3251] → [56.3251:3321]

        ForceArray => ['error', 'job', 'arg'],
        KeyAttr => [],

[56.3251]

[56.3321]

        ForceArray => ['error', 'job', 'arg', 'output'],
        KeyAttr => { output => "+name" },

Replacement in src/lib/Hydra/Helper/AddBuilds.pm at line 751 [49.2663]

B:BD[52.9046] → [52.9046:9116]

            my $input = $inputInfo->{$arg->{name}}->[$arg->{altnr}] ;

[52.9046]

[52.9116]

            my $input = $inputInfo->{$arg->{name}}->[$arg->{altnr}];

Deletion in src/lib/Hydra/Helper/AddBuilds.pm at line 769 [49.2663]
B:BD[57.52] → [57.52:87]
```
    my $outPath = $build->outpath;
```
Insertion in src/lib/Hydra/Helper/AddBuilds.pm at line 770 [49.2663]
[57.110]
[57.110]
```
    my $explicitProducts = 0;
```

Replacement in src/lib/Hydra/Helper/AddBuilds.pm at line 772 [49.2663]

B:BD[57.111] → [57.111:169]

B:BD[57.169] → [50.1648:1982]

    if (-e "$outPath/nix-support/hydra-build-products") {
        open LIST, "$outPath/nix-support/hydra-build-products" or die;
        while (<LIST>) {
            /^([\w\-]+)\s+([\w\-]+)\s+(\S+)(\s+(\S+))?$/ or next;
            my $type = $1;
            my $subtype = $2 eq "none" ? "" : $2;
            my $path = $3;
            my $defaultPath = $5;
            next unless -e $path;

[57.111]

[57.567]

    foreach my $output ($build->buildoutputs->all) {
        my $outPath = $output->path;
        if (-e "$outPath/nix-support/hydra-build-products") {
            $explicitProducts = 1;
            open LIST, "$outPath/nix-support/hydra-build-products" or die;
            while (<LIST>) {
                /^([\w\-]+)\s+([\w\-]+)\s+(\S+)(\s+(\S+))?$/ or next;
                my $type = $1;
                my $subtype = $2 eq "none" ? "" : $2;
                my $path = $3;
                my $defaultPath = $5;
                next unless -e $path;

Replacement in src/lib/Hydra/Helper/AddBuilds.pm at line 786 [49.2663]

B:BD[57.568] → [50.1983:2031]

            my $fileSize, my $sha1, my $sha256;

[57.568]

[57.624]

                my $fileSize, my $sha1, my $sha256;

Replacement in src/lib/Hydra/Helper/AddBuilds.pm at line 788 [49.2663]

B:BD[57.625] → [50.2032:2079]

            # !!! validate $path, $defaultPath

[57.625]

[56.3430]

                # !!! validate $path, $defaultPath

Replacement in src/lib/Hydra/Helper/AddBuilds.pm at line 790 [49.2663]

B:BD[56.3431] → [50.2080:2216]

            if (-f $path) {
                my $st = stat($path) or die "cannot stat $path: $!";
                $fileSize = $st->size;

[56.3431]

[53.417]

                if (-f $path) {
                    my $st = stat($path) or die "cannot stat $path: $!";
                    $fileSize = $st->size;

Replacement in src/lib/Hydra/Helper/AddBuilds.pm at line 794 [49.2663]

∅:D[53.418] → [50.2217:2359]

B:BD[57.866] → [50.2217:2359]

                $sha1 = `nix-hash --flat --type sha1 $path`
                    or die "cannot hash $path: $?";;
                chomp $sha1;

[53.418]

[53.419]

                    $sha1 = `nix-hash --flat --type sha1 $path`
                        or die "cannot hash $path: $?";;
                    chomp $sha1;

Replacement in src/lib/Hydra/Helper/AddBuilds.pm at line 798 [49.2663]

∅:D[53.420] → [50.2376:2538]

B:BD[50.2376] → [50.2376:2538]

                $sha256 = `nix-hash --flat --type sha256 $path`
                    or die "cannot hash $path: $?";;
                chomp $sha256;
            }

[53.420]

[56.3431]

                    $sha256 = `nix-hash --flat --type sha256 $path`
                        or die "cannot hash $path: $?";;
                    chomp $sha256;
                }

Replacement in src/lib/Hydra/Helper/AddBuilds.pm at line 803 [49.2663]

B:BD[56.3432] → [50.2539:2603]

            my $name = $path eq $outPath ? "" : basename $path;

[56.3432]

[53.421]

                my $name = $path eq $outPath ? "" : basename $path;

Replacement in src/lib/Hydra/Helper/AddBuilds.pm at line 805 [49.2663]

∅:D[53.422] → [50.2604:3055]

B:BD[57.1341] → [50.2604:3055]

            $db->resultset('BuildProducts')->create(
                { build => $build->id
                , productnr => $productnr++
                , type => $type
                , subtype => $subtype
                , path => $path
                , filesize => $fileSize
                , sha1hash => $sha1
                , sha256hash => $sha256
                , name => $name
                , defaultpath => $defaultPath
                });

[53.422]

[50.3055]

                $db->resultset('BuildProducts')->create(
                    { build => $build->id
                    , productnr => $productnr++
                    , type => $type
                    , subtype => $subtype
                    , path => $path
                    , filesize => $fileSize
                    , sha1hash => $sha1
                    , sha256hash => $sha256
                    , name => $name
                    , defaultpath => $defaultPath
                    });
            }
            close LIST;

Deletion in src/lib/Hydra/Helper/AddBuilds.pm at line 820 [49.2663]
B:BD[50.3065] → [50.3065:3085]
```
        close LIST;
```
Insertion in src/lib/Hydra/Helper/AddBuilds.pm at line 821 [49.2663]
[58.1281]
[57.1948]
```
    return if $explicitProducts;
```
Replacement in src/lib/Hydra/Helper/AddBuilds.pm at line 824 [49.2663]
B:BD[57.1949] → [58.1282:1293]
```
    else {
```
[57.1949]
[50.3086]
```
    foreach my $output ($build->buildoutputs->all) {
        my $outPath = $output->path;
```

Replacement in src/lib/Hydra/Helper/AddBuilds.pm at line 830 [49.2663]

B:BD[50.3243] → [50.3243:3271]

            , subtype => ""

[50.3243]

[50.3271]

            , subtype => $output->name eq "out" ? "" : $output->name

Insertion in src/lib/Hydra/Helper/AddBuilds.pm at line 853 [49.2663]

[59.186]

[56.3600]


    my @outputNames = sort keys %{$buildInfo->{output}};
    die unless scalar @outputNames;

Replacement in src/lib/Hydra/Helper/AddBuilds.pm at line 857 [49.2663]

B:BD[56.3601] → [56.3601:3724]

    my $jobName = $buildInfo->{jobName};
    my $drvPath = $buildInfo->{drvPath};
    my $outPath = $buildInfo->{outPath};

[56.3601]

[56.3724]

    # In various checks we can use an arbitrary output (the first)
    # rather than all outputs, since if one output is the same, the
    # others will be as well.
    my $firstOutputName = $outputNames[0];
    my $firstOutputPath = $buildInfo->{output}->{$firstOutputName}->{path};
    my $jobName = $buildInfo->{jobName} or die;
    my $drvPath = $buildInfo->{drvPath} or die;

Replacement in src/lib/Hydra/Helper/AddBuilds.pm at line 889 [49.2663]

B:BD[56.4677] → [56.4677:4892]

        # the channels.
        # !!! Checking $outPath doesn't take meta-attributes into
        # account.  For instance, do we want a new build to be
        # scheduled if the meta.maintainers field is changed?

[56.4677]

[60.495]

        # the channels.  FIXME: Checking the output paths doesn't take
        # meta-attributes into account.  For instance, do we want a
        # new build to be scheduled if the meta.maintainers field is
        # changed?

Insertion in src/lib/Hydra/Helper/AddBuilds.pm at line 894 [49.2663]

[60.528]

[61.0]

            # Only check one output: if it's the same, the other will be as well.
            my $firstOutput = $outputNames[0];

Replacement in src/lib/Hydra/Helper/AddBuilds.pm at line 901 [49.2663]

B:BD[40.4387] → [40.4387:4550]

                { project => $project->name, jobset => $jobset->name, job => $job->name, outPath => $outPath },
                { rows => 1, columns => ['id'] });

[40.4387]

[60.663]

                { project => $project->name, jobset => $jobset->name, job => $job->name,
                  name => $firstOutputName, path => $firstOutputPath },
                { rows => 1, columns => ['id'], join => ['buildoutputs'] });

Replacement in src/lib/Hydra/Helper/AddBuilds.pm at line 913 [49.2663]

B:BD[59.279] → [59.279:345]

        my $prev = $$jobOutPathMap{$job->name . "\t" . $outPath};

[59.279]

[59.345]

        my $prev = $$jobOutPathMap{$job->name . "\t" . $firstOutputPath};

Replacement in src/lib/Hydra/Helper/AddBuilds.pm at line 921 [49.2663]
∅:D[53.581] → [56.5184:5211]
B:BD[56.5184] → [56.5184:5211]
```
        # Nope, so add it.
```
[53.581]
[60.881]
```
        # Are the outputs already in the Nix store?  Then add a cached
        # build.
```

Replacement in src/lib/Hydra/Helper/AddBuilds.pm at line 924 [49.2663]

B:BD[60.905] → [60.905:942]

        if (isValidPath($outPath)) {

[60.905]

[60.942]

        my $allValid = 1;
        my $buildStatus;
        my $releaseName;
        foreach my $name (@outputNames) {
            my $path = $buildInfo->{output}->{$name}->{path};
            if (isValidPath($path)) {
                if (-f "$path/nix-support/failed") {
                    $buildStatus = 6;
                } else {
                    $buildStatus //= 0;
                }
                $releaseName //= getReleaseName($path);
            } else {
                $allValid = 0;
                last;
            }
        }
        if ($allValid) {

Replacement in src/lib/Hydra/Helper/AddBuilds.pm at line 946 [49.2663]

B:BD[60.1038] → [62.0:74]

                , buildstatus => -f "$outPath/nix-support/failed" ? 6 : 0

[60.1038]

[53.615]

                , buildstatus => $buildStatus

Replacement in src/lib/Hydra/Helper/AddBuilds.pm at line 949 [49.2663]

B:BD[60.1199] → [60.1199:1290]

                , errormsg => ""
                , releasename => getReleaseName($outPath)

[53.688]

[60.1290]

                , releasename => $releaseName

Insertion in src/lib/Hydra/Helper/AddBuilds.pm at line 955 [49.2663]
[53.690]
[56.5211]
```
        # Add the build to the database.
```
Deletion in src/lib/Hydra/Helper/AddBuilds.pm at line 967 [49.2663]
B:BD[56.5662] → [56.5662:5696]
```
            , outpath => $outPath
```

Insertion in src/lib/Hydra/Helper/AddBuilds.pm at line 975 [49.2663]

[56.5888]


        $build->buildoutputs->create({ name => $_, path => $buildInfo->{output}->{$_}->{path} })
            foreach @outputNames;

Replacement in src/lib/Hydra/Helper/AddBuilds.pm at line 980 [49.2663]

B:BD[60.1542] → [59.478:546]

        $$jobOutPathMap{$job->name . "\t" . $outPath} = $build->id;

[60.1542]

[53.725]

        $$jobOutPathMap{$job->name . "\t" . $firstOutputPath} = $build->id;

Replacement in src/lib/Hydra/Helper/AddBuilds.pm at line 1028 [49.2663]

B:BD[63.379] → [31.2990:3068]

        my $drvpath = $build->drvpath;
        my $outpath = $build->outpath;

[63.379]

[63.459]

        my @paths;
        push @paths, $build->drvpath;
        push @paths, $_->drvpath foreach $build->buildsteps;

Replacement in src/lib/Hydra/Helper/AddBuilds.pm at line 1032 [49.2663]
B:BD[63.460] → [63.460:530]
B:BD[63.530] → [40.4665:4715]
∅:D[6.90] → [63.578:588]
∅:D[31.3112] → [63.578:588]
∅:D[40.4715] → [63.578:588]
B:BD[63.578] → [63.578:588]
```
        my $paths = "";
        foreach my $bs ($build->buildsteps) {
            $paths = $paths . " " . $bs->outpath;
        }
```
[63.460]
[63.588]
```
        my $r = `nix-store --clear-failed-paths @paths`;
```
Deletion in src/lib/Hydra/Helper/AddBuilds.pm at line 1034 [49.2663]
B:BD[63.589] → [63.589:655]
B:BD[63.715] → [63.715:716]
```
        my $r = `nix-store --clear-failed-paths $paths $outpath`;
```

Replacement in src/lib/Hydra/Helper/Nix.pm at line 17 [65.436]

B:BD[64.48] → [35.845:911]

    jobsetOverview removeAsciiEscapes getDrvLogPath logContents);

[64.48]

[66.77]

    jobsetOverview removeAsciiEscapes getDrvLogPath logContents
    getMainOutput);

Insertion in src/lib/Hydra/Helper/Nix.pm at line 282 [65.436]

[34.5602]

[67.850]

sub getMainOutput {
    my ($build) = @_;
    return
        $build->buildoutputs->find({name => "out"}) //
        $build->buildoutputs->find({}, {limit => 1, order_by => ["name"]});
}

Deletion in src/lib/Hydra/Schema/BuildSteps.pm at line 46 [69.1675]
B:BD[68.6024] → [68.6024:6040]
```
=head2 outpath
```
Deletion in src/lib/Hydra/Schema/BuildSteps.pm at line 47 [69.1675]
B:BD[68.6041] → [70.6394:6414]
∅:D[70.6414] → [68.6082:6099]
B:BD[68.6082] → [68.6082:6099]
B:BD[68.6129] → [68.6129:6130]
```
  data_type: 'text'
  is_nullable: 1
```
Deletion in src/lib/Hydra/Schema/BuildSteps.pm at line 94 [69.1675]
∅:D[71.6258] → [69.2162:2175]
∅:D[70.6840] → [69.2162:2175]
B:BD[69.2162] → [69.2162:2175]
B:BD[69.2175] → [70.6841:6886]
```
  "outpath",
  { data_type => "text", is_nullable => 1 },
```
Insertion in src/lib/Hydra/Schema/BuildSteps.pm at line 141 [69.1675]
[69.2816]
[69.2958]
```
=head2 buildstepoutputs
```

Replacement in src/lib/Hydra/Schema/BuildSteps.pm at line 143 [69.1675]

B:BD[69.2959] → [35.2894:3036]

# Created by DBIx::Class::Schema::Loader v0.07033 @ 2013-01-22 13:29:36
# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:ItI1OvxHfLTzLVEqfPRjHg

[69.2959]

Type: has_many
Related object: L<Hydra::Schema::BuildStepOutputs>
=cut

Insertion in src/lib/Hydra/Schema/BuildSteps.pm at line 149 [69.1675]

[69.2960]

[69.3050]

__PACKAGE__->has_many(
  "buildstepoutputs",
  "Hydra::Schema::BuildStepOutputs",
  { "foreign.build" => "self.build", "foreign.stepnr" => "self.stepnr" },
  undef,
);
# Created by DBIx::Class::Schema::Loader v0.07033 @ 2013-01-30 16:36:03
# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:ZiA1nv73Fpp0/DTi4sLfEQ

Deletion in src/lib/Hydra/Schema/Builds.pm at line 74 [72.5202]
B:BD[68.7976] → [68.7976:7992]
```
=head2 outpath
```
Deletion in src/lib/Hydra/Schema/Builds.pm at line 75 [72.5202]
B:BD[68.7993] → [70.7791:7811]
∅:D[70.7811] → [68.8034:8051]
B:BD[68.8034] → [68.8034:8051]
B:BD[68.8065] → [68.8065:8066]
```
  data_type: 'text'
  is_nullable: 0
```
Deletion in src/lib/Hydra/Schema/Builds.pm at line 222 [72.5202]
B:BD[72.5698] → [70.8495:8540]
∅:D[71.8164] → [72.5758:5771]
∅:D[70.8540] → [72.5758:5771]
B:BD[72.5758] → [72.5758:5771]
```
  { data_type => "text", is_nullable => 0 },
  "outpath",
```

Insertion in src/lib/Hydra/Schema/Builds.pm at line 314 [72.5202]

[70.9620]

[35.3047]

  undef,
);
=head2 buildoutputs
Type: has_many
Related object: L<Hydra::Schema::BuildOutputs>
=cut
__PACKAGE__->has_many(
  "buildoutputs",
  "Hydra::Schema::BuildOutputs",
  { "foreign.build" => "self.id" },

Insertion in src/lib/Hydra/Schema/Builds.pm at line 346 [72.5202]
[73.2883]
[68.9309]
```
=head2 buildstepoutputs
```

Insertion in src/lib/Hydra/Schema/Builds.pm at line 349 [72.5202]

[68.9310]

[68.9387]

Type: has_many
Related object: L<Hydra::Schema::BuildStepOutputs>
=cut
__PACKAGE__->has_many(
  "buildstepoutputs",
  "Hydra::Schema::BuildStepOutputs",
  { "foreign.build" => "self.id" },
  undef,
);

Replacement in src/lib/Hydra/Schema/Builds.pm at line 468 [72.5202]

B:BD[74.1182] → [35.3433:3575]

# Created by DBIx::Class::Schema::Loader v0.07033 @ 2013-01-22 13:34:39
# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:wPBFqpUWncuD9xki8Pbnvg

[74.1182]

[73.3377]

# Created by DBIx::Class::Schema::Loader v0.07033 @ 2013-01-30 16:22:11
# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:YBdqPWScG4dtGx+U3dJcwA

Replacement in src/lib/Hydra/Schema/Builds.pm at line 485 [72.5202]

B:BD[75.147] → [75.147:221]

B:BD[75.221] → [76.2576:2616]

∅:D[76.2616] → [75.262:300]

B:BD[75.262] → [75.262:300]

∅:D[75.300] → [77.293:296]

B:BD[73.3767] → [77.293:296]

__PACKAGE__->has_one(
  "actualBuildStep",
  "Hydra::Schema::BuildSteps",
  { 'foreign.outpath' => 'self.outpath'
  , 'foreign.build' => 'self.id'
  },
);

[75.147]

[77.296]

#__PACKAGE__->has_one(
#  "actualBuildStep",
#  "Hydra::Schema::BuildSteps",
#  { 'foreign.outpath' => 'self.outpath'
#  , 'foreign.build' => 'self.id'
#  },
#);

Replacement in src/lib/Hydra/View/NixExprs.pm at line 24 [78.381]

B:BD[78.543] → [78.543:597]

B:BD[78.597] → [2.0:60]

∅:D[2.60] → [78.648:679]

B:BD[78.648] → [78.648:679]

    foreach my $name (keys %{$c->stash->{nixPkgs}}) {
        my $build = $c->stash->{nixPkgs}->{$name}->{build};
        $res .= "  # $name\n";

[78.543]

[78.679]

    foreach my $pkg (@{$c->stash->{nixPkgs}}) {
        my $build = $pkg->{build};
        $res .= "  # $pkg->{name}\n";

Replacement in src/lib/Hydra/View/NixExprs.pm at line 30 [78.381]

B:BD[79.302] → [5.0:69]

        $res .= "    outPath = " . (escape $build->outpath) . ";\n";

[79.302]

[78.970]

        $res .= "    outPath = " . (escape $pkg->{outPath}) . ";\n";

Insertion in src/lib/Hydra/View/NixPkg.pm at line 13 [80.1]
[80.211]
[81.96]
```
    # FIXME: add multiple output support
```

Replacement in src/lib/Hydra/View/NixPkg.pm at line 16 [80.1]

B:BD[80.327] → [82.0:56]

        . " " . $build->drvpath . " " . $build->outpath

[80.327]

[40.4868]

        . " " . $build->drvpath . " " . $build->buildoutputs->find({name => "out"})->path

Replacement in src/root/admin.tt at line 29 [84.8348]

B:BD[83.10531] → [83.10531:10601]

                <td><tt>[% step.outpath.match('-(.*)').0 %]</tt></td>

[83.10531]

[83.10601]

                <td><tt>[% step.drvpath.match('-(.*)').0 %]</tt></td>

Replacement in src/root/all.tt at line 9 [85.1038]

B:BD[85.1128] → [85.1128:1234]

B:BD[85.1234] → [47.3962:4019]

<p>Showing builds [% (page - 1) * resultsPerPage + 1 %] - [% (page - 1) * resultsPerPage + builds.size %]
out of [% total %] in order of descending timestamp.</p>

[85.1128]

[85.1297]

<p>Showing builds [% (page - 1) * resultsPerPage + 1 %] - [% (page - 1) * resultsPerPage + builds.size %] out of [% total %] in order of descending timestamp.</p>

Insertion in src/root/build.tt at line 10 [72.7350]

[86.6589]

[87.1960]


[% BLOCK renderOutputs %]
  [% start=1; FOREACH output IN outputs %]
    [% IF !start %],<br/>[% END; start=0; output.path %]
  [% END %]
[% END %]

Replacement in src/root/build.tt at line 18 [72.7350]

B:BD[87.1990] → [76.3118:3530]

B:BD[76.3530] → [35.9877:10136]

∅:D[35.10136] → [76.3787:4764]

B:BD[76.3787] → [76.3787:4764]

∅:D[76.4764] → [88.88:145]

B:BD[87.3198] → [88.88:145]

B:BD[88.145] → [76.4765:4844]

B:BD[76.4844] → [12.0:54]

∅:D[12.54] → [76.5094:5187]

B:BD[76.5094] → [76.5094:5187]

B:BD[76.5187] → [12.55:173]

∅:D[12.173] → [76.5187:5356]

B:BD[76.5187] → [76.5187:5356]

B:BD[76.5356] → [35.10137:10180]

∅:D[35.10180] → [76.5404:5725]

B:BD[76.5404] → [76.5404:5725]

∅:D[89.2447] → [72.7413:7414]

∅:D[90.3588] → [72.7413:7414]

∅:D[87.3878] → [72.7413:7414]

∅:D[76.5725] → [72.7413:7414]

∅:D[86.6589] → [72.7413:7414]

B:BD[72.7413] → [72.7413:7414]

        <table class="tablesorter table table-striped table-condensed">
          <thead>
            <tr><th>Nr</th><th>What</th><th>Duration</th><th>Machine</th><th>Status</th></tr>
          </thead>
          <tbody>
            [% FOREACH step IN build.buildsteps -%]
                        [% IF ( type == "All" ) || ( type == "Failed" && step.status != 0 ) || ( type == "Running" && step.busy == 1 ) -%]
                      [% has_log = log_exists(step.drvpath);
                         log = c.uri_for('/build' build.id 'nixlog' step.stepnr); -%]
                      <tr [% IF has_log %] class="clickable" onclick="window.location = '[% log %]'" [% END %]>
                        <td>[% step.stepnr %]</td>
                        <td>
                          [% IF step.type == 0 %]
                            Build of <tt>[% step.outpath %]</tt>
                          [% ELSE %]
                            Substitution of <tt>[% step.outpath %]</tt>
                          [% END %]
                        </td>
                        <td>
                          [% IF step.busy == 0 %]
                            [% INCLUDE renderDuration duration = step.stoptime - step.starttime %]
                          [% ELSE %]
                            [% IF build.finished %]
                              [% INCLUDE renderDuration duration = build.stoptime - step.starttime %]
                            [% ELSE %]
                              [% INCLUDE renderDuration duration = curTime - step.starttime %]
                            [% END %]
                          [% END %]
                        </td>
                <td>[% step.machine.split('@').1 %]</td>
                        <td>
                          [% IF step.busy == 1 %]
                            <strong>Building</strong>
                          [% ELSIF step.status == 0 %]
                            Succeeded
                          [% ELSIF step.status == 4 %]
                            <span class="error">Aborted</span>
                          [% ELSE %]
                            <span class="error">Failed: [% HTML.escape(step.errormsg) %]</span>
                          [% END %]
                          [% IF has_log %]
                            (<a href="[% log %]">log</a>, <a href="[% "$log/raw" %]">raw</a>, <a href="[% "$log/tail-reload" %]">tail</a>)
                          [% END %]
                        </td>
                      </tr>
                    [% END %]
            [% END %]
          </tbody>
        </table>

[87.1990]

[87.3879]

  <table class="tablesorter table table-striped table-condensed">
    <thead>
      <tr><th>Nr</th><th>What</th><th>Duration</th><th>Machine</th><th>Status</th></tr>
    </thead>
    <tbody>
      [% FOREACH step IN build.buildsteps %]
        [% IF ( type == "All" ) || ( type == "Failed" && step.status != 0 ) || ( type == "Running" && step.busy == 1 ) %]
          [% has_log = log_exists(step.drvpath);
              log = c.uri_for('/build' build.id 'nixlog' step.stepnr); %]
            <tr [% IF has_log %] class="clickable" onclick="window.location = '[% log %]'" [% END %]>
              <td>[% step.stepnr %]</td>
              <td>
                [% IF step.type == 0 %]
                  Build of <tt>[% INCLUDE renderOutputs outputs=step.buildstepoutputs %]</tt>
                [% ELSE %]
                  Substitution of <tt>[% INCLUDE renderOutputs outputs=step.buildstepoutputs %]</tt>
                [% END %]
              </td>
              <td>
                [% IF step.busy == 0;
                     INCLUDE renderDuration duration = step.stoptime - step.starttime;
                   ELSIF build.finished;
                     INCLUDE renderDuration duration = build.stoptime - step.starttime;
                   ELSE;
                     INCLUDE renderDuration duration = curTime - step.starttime;
                   END %]
              </td>
              <td>[% step.machine.split('@').1 %]</td>
              <td>
                [% IF step.busy == 1 %]
                  <strong>Building</strong>
                [% ELSIF step.status == 0 %]
                  Succeeded
                [% ELSIF step.status == 4 %]
                  <span class="error">Aborted</span>
                [% ELSE %]
                  <span class="error">Failed: [% HTML.escape(step.errormsg) %]</span>
                [% END %]
                [% IF has_log %]
                  (<a href="[% log %]">log</a>, <a href="[% "$log/raw" %]">raw</a>, <a href="[% "$log/tail-reload" %]">tail</a>)
                [% END %]
              </td>
            </tr>
          [% END %]
        [% END %]
    </tbody>
  </table>

Replacement in src/root/build.tt at line 116 [72.7350]

B:BD[76.8045] → [76.8045:8103]

                                  [% IF build.finished %]

[76.8045]

[76.8103]

                                  [% IF build.iscachedbuild %]
                                    <tr>
                                      <th>Cached from:</th>
                                      <td>
                                        [% INCLUDE renderFullBuildLink build=cachedBuild %]
                                      </td>
                                    </tr>
                                  [% ELSE %]

Replacement in src/root/build.tt at line 127 [72.7350]

B:BD[76.8244] → [76.8244:8740]

                                        [% IF build.iscachedbuild %]
                                          (cached[% IF cachedBuild %] from [% INCLUDE renderFullBuildLink build=cachedBuild %][% END %])
                                        [% ELSE %]
                                                [% INCLUDE renderDuration duration = build.stoptime - build.starttime %] finished at [% INCLUDE renderDateTime timestamp = build.stoptime %]
                                        [% END %]

[76.8244]

[76.8740]

                                        [% INCLUDE renderDuration duration = build.stoptime - build.starttime %]; finished at [% INCLUDE renderDateTime timestamp = build.stoptime %]

Deletion in src/root/build.tt at line 226 [72.7350]

B:BD[76.11304] → [76.11304:12179]

                  <tr>
                    <th>Build ID:</th>
                    <td>[% build.id %]</td>
                  </tr>
                  <tr>
                    <th>Status:</th>
                    <td>
                        [% INCLUDE renderStatus build=build %]
                    </td>
                  </tr>
                  <tr>
                    <th>Project:</th>
                    <td>[% INCLUDE renderProjectName project=project.name %]</td>
                  </tr>
                  <tr>
                    <th>Jobset:</th>
                    <td>[% INCLUDE renderJobsetName project=project.name jobset=jobset.name %]</td>
                  </tr>
                  <tr>
                    <th>Job name:</th>
                    <td>[% INCLUDE renderJobName project=project.name jobset=jobset.name job=job.name %]</td>
                  </tr>

Deletion in src/root/build.tt at line 236 [72.7350]

B:BD[76.12625] → [76.12625:12871]

                  [% IF build.releasename %]
                    <tr>
                      <th>Release name:</th>
                      <td><tt>[% HTML.escape(build.releasename) %]</tt></td>
                    </tr>
                  [% END %]

Replacement in src/root/build.tt at line 270 [72.7350]

B:BD[76.14763] → [76.14763:14811]

                    <th>Output store path:</th>

[76.14763]

[76.14811]

                    <th>Output store paths:</th>

Replacement in src/root/build.tt at line 272 [72.7350]

B:BD[76.14836] → [76.14836:14887]

                      <tt>[% build.outpath %]</tt>

[76.14836]

[76.14887]

                      <tt>[% INCLUDE renderOutputs outputs=build.buildoutputs %]</tt>

Deletion in src/root/build.tt at line 278 [72.7350]
∅:D[76.15121] → [31.5836:5872]
B:BD[30.172] → [31.5836:5872]
```
                  [% IF pathHash %]
```

Deletion in src/root/build.tt at line 279 [72.7350]

B:BD[76.15145] → [76.15145:15370]

                    <th>Output store path hash:</th>
                    <td>
                      <tt>[% pathHash %]</tt>
                    </td>
                  </tr>
                  [% END %]
                  <tr>

Insertion in src/root/channel-contents.tt at line 67 [23.3375]

[23.4517]

          [% IF pkg.outName != 'out' %] [[% pkg.outName %]][% END %]

Replacement in src/root/common.tt at line 350 [93.2803]

B:BD[91.143] → [92.1761:1937]

                        <tr><td><b>[% bi1.name %]</b></td><td><tt>[% INCLUDE renderShortInputValue input=bi1 %] to [% INCLUDE renderShortInputValue input=bi2 %]</tt></td></tr>

[91.143]

[91.284]

                        <tr><td><b>[% bi1.name %]</b></td><td><tt>[% INCLUDE renderShortInputValue input=bi1 %]</tt> to <tt>[% INCLUDE renderShortInputValue input=bi2 %]</tt></td></tr>

Replacement in src/root/common.tt at line 363 [93.2803]

B:BD[94.518] → [92.2441:2603]

                            <b>[% bi1.name %]</b></td><td><tt>[% INCLUDE renderShortInputValue input=bi1 %] to [% INCLUDE renderShortInputValue input=bi2 %]</tt>

[94.518]

[91.815]

                            <b>[% bi1.name %]</b></td><td><tt>[% INCLUDE renderShortInputValue input=bi1 %]</tt> to <tt>[% INCLUDE renderShortInputValue input=bi2 %]</tt>

Replacement in src/root/common.tt at line 398 [93.2803]
∅:D[7.124] → [83.11682:11744]
B:BD[83.11682] → [83.11682:11744]
```
        <td><tt>[% step.outpath.match('-(.*)').0 %]</tt></td>
```
[7.124]
[83.11744]
```
        <td><tt>[% step.drvpath.match('-(.*)').0 %]</tt></td>
```
Replacement in src/root/deps.tt at line 11 [39.1684]
B:BD[39.1937] → [39.1937:1991]
```
<h1>Runtime dependencies for [% build.outpath %]</h1>
```
[39.1937]
[39.1991]
```
<h1>Runtime dependencies</h1>
```
Replacement in src/root/deps.tt at line 29 [39.1684]
B:BD[39.2367] → [39.2367:2424]
```
<h1>Build time dependencies for [% build.drvpath %]</h1>
```
[39.2367]
[39.2424]
```
<h1>Build time dependencies</h1>
```

Replacement in src/root/jobset.tt at line 207 [86.8409]

B:BD[76.30375] → [76.30375:30517]

                            [% FOREACH j IN activeJobs %] [% INCLUDE renderJobName project=project.name jobset=jobset.name job=j %] [% END %]

[76.30375]

[76.30517]

                            [% FOREACH j IN activeJobs %][% INCLUDE renderJobName project=project.name jobset=jobset.name job=j %]<br/>[% END %]

Replacement in src/root/jobset.tt at line 215 [86.8409]

B:BD[76.30810] → [76.30810:30954]

                            [% FOREACH j IN inactiveJobs %] [% INCLUDE renderJobName project=project.name jobset=jobset.name job=j %] [% END %]

[76.30810]

[76.30954]

                            [% FOREACH j IN inactiveJobs %][% INCLUDE renderJobName project=project.name jobset=jobset.name job=j %]<br/>[% END %]

Replacement in src/root/log.tt at line 7 [72.11783]

B:BD[95.591] → [95.591:687]

  This is the build log of path <tt>[% IF step; step.outpath; ELSE; build.outpath; END %]</tt>.

[95.591]

[95.687]

  This is the build log of derivation <tt>[% IF step; step.drvpath; ELSE; build.drvpath; END %]</tt>.

Replacement in src/root/product-list.tt at line 19 [97.3098]

∅:D[34.9534] → [96.0:57]

B:BD[98.51] → [96.0:57]

          [% filename = "${build.nixname}.closure.gz" %]

[34.9534]

[96.57]

          [% filename = build.nixname _ (product.subtype ? "-" _ product.subtype : "") _ ".closure.gz" %]

Replacement in src/root/product-list.tt at line 73 [97.3098]

∅:D[76.31281] → [96.745:804]

B:BD[96.745] → [96.745:804]

            [% filename = "${build.nixname}.closure.gz" %]

[76.31281]

[96.804]

            [% filename = build.nixname _ (product.subtype ? "-" _ product.subtype : "") _ ".closure.gz" %]

Insertion in src/script/hydra-build at line 4 [99.2912]
[99.2939]
[99.2939]
```
use List::MoreUtils qw(all);
```
Insertion in src/script/hydra-build at line 62 [99.2912]
[100.1033]
[101.13]
Insertion in src/script/hydra-build at line 76 [99.2912]
[101.362]
[101.362]

Replacement in src/script/hydra-build at line 133 [99.2912]

B:BD[102.623] → [102.623:674]

        [ "Output store path:", $build->outpath ],

[102.623]

[102.674]

        [ "Output store path:", join(", ", map { $_->path } $build->buildoutputs) ],

Insertion in src/script/hydra-build at line 210 [99.2912]
[103.870]
[103.870]

Insertion in src/script/hydra-build at line 212 [99.2912]

[103.871]

sub addBuildStepOutputs {
    my ($step) = @_;
    my $drv = derivationFromPath($step->drvpath);
    $step->buildstepoutputs->create({ name => $_, path => $drv->{outputs}->{$_} })
        foreach keys %{$drv->{outputs}};
}

Insertion in src/script/hydra-build at line 219 [99.2912]
[103.872]
[73.7330]

Insertion in src/script/hydra-build at line 222 [99.2912]

[73.7366]

[99.3229]


    my %outputs;
    $outputs{$_->name} = $_->path foreach $build->buildoutputs->all;

Deletion in src/script/hydra-build at line 227 [99.2912]
B:BD[104.1084] → [104.1084:1121]
```
    my $outPath   = $build->outpath;
```
Replacement in src/script/hydra-build at line 239 [99.2912]
B:BD[99.3470] → [99.3470:3504]
```
    if (!isValidPath($outPath)) {
```
[105.3434]
[99.3504]
```
    unless (all { isValidPath($_) } values(%outputs)) {
```
Deletion in src/script/hydra-build at line 251 [99.2912]
B:BD[69.5001] → [11.516:585]
```
        # Note: `--timeout' was added in Nix 1.0pre27564, June 2011.
```

Replacement in src/script/hydra-build at line 255 [99.2912]

∅:D[106.187] → [13.1105:1163]

B:BD[13.1105] → [13.1105:1163]

            "--add-root " . gcRootFor $outPath . " 2>&1";

[106.187]

[107.405]

            "--add-root " . gcRootFor($outputs{out} // $outputs{(sort keys %outputs)[0]}) . " 2>&1";
        print STDERR "$cmd\n";

Replacement in src/script/hydra-build at line 277 [99.2912]

∅:D[43.974] → [108.4340:4388]

B:BD[69.5496] → [108.4340:4388]

                    $build->buildsteps->create(

[43.974]

[109.25]

                    my $step = $build->buildsteps->create(

Deletion in src/script/hydra-build at line 281 [99.2912]
∅:D[109.157] → [69.5734:5774]
B:BD[69.5734] → [69.5734:5774]
```
                        , outpath => $2
```
Insertion in src/script/hydra-build at line 285 [99.2912]
[69.5878]
[69.5878]
```
                    addBuildStepOutputs($step);
```

Replacement in src/script/hydra-build at line 321 [99.2912]

∅:D[4.333] → [108.4694:4746]

B:BD[110.2927] → [108.4694:4746]

                        $build->buildsteps->create(

[4.333]

[111.379]

                        my $step = $build->buildsteps->create(

Deletion in src/script/hydra-build at line 325 [99.2912]
∅:D[112.4025] → [110.3191:3235]
B:BD[110.3191] → [110.3191:3235]
```
                            , outpath => $2
```

Insertion in src/script/hydra-build at line 331 [99.2912]

[110.3533]

                        addBuildStepOutputs($step);

Replacement in src/script/hydra-build at line 337 [99.2912]
B:BD[113.730] → [113.730:764]
```
                my $outPath = $1;
```
[113.730]
[43.1045]
```
                my $path = $1;
```

Replacement in src/script/hydra-build at line 339 [99.2912]

∅:D[43.1079] → [108.4802:4850]

B:BD[113.798] → [108.4802:4850]

B:BD[108.4850] → [114.508:585]

                    $build->buildsteps->create(
                        { stepnr => ($buildSteps{$outPath} = $buildStepNr++)

[43.1079]

[113.950]

                    my $step = $build->buildsteps->create(
                        { stepnr => ($buildSteps{$path} = $buildStepNr++)

Deletion in src/script/hydra-build at line 342 [99.2912]
B:BD[113.1003] → [113.1003:1043]
```
                        , outpath => $1
```

Insertion in src/script/hydra-build at line 345 [99.2912]

[113.1151]

                    # "out" is kinda fake (substitutions don't have named outputs).
                    $step->buildstepoutputs->create({ name => "out", path => $path });

Replacement in src/script/hydra-build at line 351 [99.2912]
B:BD[113.1246] → [113.1246:1280]
```
                my $outPath = $1;
```
[113.1246]
[43.1080]
```
                my $path = $1;
```

Replacement in src/script/hydra-build at line 353 [99.2912]

∅:D[43.1114] → [114.586:685]

B:BD[113.1314] → [114.586:685]

                    my $step = $build->buildsteps->find({stepnr => $buildSteps{$outPath}}) or die;

[43.1114]

[115.641]

                    my $step = $build->buildsteps->find({stepnr => $buildSteps{$path}}) or die;

Replacement in src/script/hydra-build at line 359 [99.2912]
B:BD[113.1731] → [113.1731:1765]
```
                my $outPath = $1;
```
[113.1731]
[43.1115]
```
                my $path = $1;
```

Replacement in src/script/hydra-build at line 361 [99.2912]

∅:D[43.1149] → [114.686:785]

B:BD[113.1799] → [114.686:785]

                    my $step = $build->buildsteps->find({stepnr => $buildSteps{$outPath}}) or die;

[43.1149]

[115.721]

                    my $step = $build->buildsteps->find({stepnr => $buildSteps{$path}}) or die;

Deletion in src/script/hydra-build at line 388 [99.2912]
B:BD[116.1533] → [117.389:407]
∅:D[117.407] → [116.1533:1558]
B:BD[116.1533] → [116.1533:1558]
```
    my $size = 0;
    my $closuresize = 0;
```
Replacement in src/script/hydra-build at line 389 [99.2912]
∅:D[117.409] → [116.1558:1591]
B:BD[116.1558] → [116.1558:1591]
B:BD[116.1591] → [118.166:249]
∅:D[119.97] → [117.495:521]
∅:D[118.249] → [117.495:521]
B:BD[117.495] → [117.495:521]
```
    if (isValidPath($outPath)) {
        my ($deriver, $hash, $time, $narSize, $refs) = queryPathInfo($outPath, 0);
        $size = $narSize;
```
[117.409]
[117.521]
```
    txn_do($db, sub {
        if ($buildStatus == 0) {
```

Replacement in src/script/hydra-build at line 392 [99.2912]

B:BD[117.522] → [119.98:154]

∅:D[119.154] → [117.583:621]

B:BD[117.583] → [117.583:621]

B:BD[117.621] → [11.712:834]

∅:D[11.834] → [117.736:746]

∅:D[120.1175] → [117.736:746]

B:BD[117.736] → [117.736:746]

∅:D[117.746] → [116.1703:1709]

B:BD[116.1703] → [116.1703:1709]

        my @closure = computeFSClosure(0, 0, $outPath);
        foreach my $path (@closure) {
            my ($deriver, $hash, $time, $narSize, $refs) = queryPathInfo($path, 0);
            $closuresize += $narSize;
        }
    }

[117.522]

[116.1709]

            my $size = 0;
            my $closureSize = 0;
            my $releaseName;

Replacement in src/script/hydra-build at line 396 [99.2912]

∅:D[116.1710] → [43.1150:1172]

B:BD[99.4021] → [43.1150:1172]

B:BD[121.1652] → [51.1383:1435]

    txn_do($db, sub {
        my $releaseName = getReleaseName($outPath);

[116.1710]

[120.1176]

            my @closure = computeFSClosure(0, 0, values %outputs);
            foreach my $path (@closure) {
                my ($deriver, $hash, $time, $narSize, $refs) = queryPathInfo($path, 0);
                $closureSize += $narSize;
                $size += $narSize if grep { $path eq $_ } values(%outputs);
            }
            foreach my $path (values %outputs) {
                $buildStatus = 6 if $buildStatus == 0 && -f "$path/nix-support/failed";
                $releaseName //= getReleaseName($path);
            }

Replacement in src/script/hydra-build at line 408 [99.2912]

∅:D[120.1177] → [34.10612:10695]

B:BD[112.4472] → [34.10612:10695]

        $buildStatus = 6 if $buildStatus == 0 && -f "$outPath/nix-support/failed";

[120.1177]

[122.123]

            $build->update(
                { releasename => $releaseName
                , size => $size
                , closuresize => $closureSize
                });
            addBuildProducts($db, $build);
        }

Deletion in src/script/hydra-build at line 427 [99.2912]

B:BD[116.1779] → [116.1779:1849]

            , size => $size
            , closuresize => $closuresize

Deletion in src/script/hydra-build at line 428 [99.2912]
B:BD[112.4543] → [121.1912:1954]
```
            , releasename => $releaseName
```
Deletion in src/script/hydra-build at line 430 [99.2912]
B:BD[99.4797] → [123.912:966]
∅:D[123.966] → [57.2494:2537]
B:BD[112.4577] → [57.2494:2537]
∅:D[57.2537] → [99.6606:6616]
B:BD[99.6606] → [99.6606:6616]
```
        if ($buildStatus == 0 || $buildStatus == 6) {
            addBuildProducts($db, $build);
        }
```

Replacement in src/script/hydra-update-gc-roots at line 24 [124.472]

B:BD[124.1073] → [125.43:152]

my @columns = ( "id", "project", "jobset", "job", "system", "finished", "outpath", "drvpath", "timestamp" );

[124.1073]

my @columns = ( "id", "project", "jobset", "job", "system", "finished", "drvpath", "timestamp" );

Replacement in src/script/hydra-update-gc-roots at line 30 [124.472]
B:BD[125.364] → [125.364:387]
```
	$build->system, "; ",
```
[125.364]
[126.30]
```
        $build->system, "; ",
```

Replacement in src/script/hydra-update-gc-roots at line 32 [124.472]

∅:D[126.106] → [127.303:343]

B:BD[127.303] → [127.303:343]

B:BD[127.343] → [125.388:414]

∅:D[125.414] → [127.381:394]

B:BD[127.381] → [127.381:394]

B:BD[127.394] → [125.415:519]

    if (isValidPath($build->outpath)) {
	addRoot $build->outpath;
    } else {
        print STDERR "    warning: output ", $build->outpath, " has disappeared\n" if $build->finished;

[126.106]

[125.519]

    foreach my $out ($build->buildoutputs->all) {
        if (isValidPath($out->path)) {
            addRoot $out->path;
        } else {
            print STDERR "    warning: output ", $out->path, " has disappeared\n" if $build->finished;
        }

Replacement in src/script/hydra-update-gc-roots at line 40 [124.472]

B:BD[125.554] → [125.554:719]

	if (isValidPath($build->drvpath)) {
	    addRoot $build->drvpath;
	} else {
	    print STDERR "    warning: derivation ", $build->drvpath, " has disappeared\n";
	}

[125.554]

[127.474]

        if (isValidPath($build->drvpath)) {
            addRoot $build->drvpath;
        } else {
            print STDERR "    warning: derivation ", $build->drvpath, " has disappeared\n";
        }

Replacement in src/script/hydra-update-gc-roots at line 62 [124.472]

B:BD[125.887] → [125.887:1005]

    "exists (select 1 from releasemembers where build = me.id)", { order_by => ["project", "jobset", "job", "id"] });

[125.887]

[125.1005]

    "exists (select 1 from releasemembers where build = me.id)",
    { order_by => ["project", "jobset", "job", "id"], columns => [ @columns ] });

Replacement in src/script/hydra-update-gc-roots at line 80 [124.472]

B:BD[127.577] → [10.0:82]

∅:D[10.82] → [128.71:112]

B:BD[128.71] → [128.71:112]

        # If the jobset has been hidden and disabled for more than one week, than
        # don't keep its builds anymore.

[127.577]

[10.83]

        # If the jobset has been hidden and disabled for more than one
        # week, then don't keep its builds anymore.

Replacement in src/script/hydra-update-gc-roots at line 92 [124.472]

B:BD[129.923] → [125.1505:1650]

	print STDERR "*** looking for the $keepnr most recent successful builds of each job in jobset ",
	    $project->name, ":", $jobset->name, "\n";

[129.923]

[127.797]

        # FIXME: base this on jobset evals?
        print STDERR "*** looking for the $keepnr most recent successful builds of each job in jobset ",
            $project->name, ":", $jobset->name, "\n";

Replacement in src/script/hydra-update-gc-roots at line 96 [124.472]

B:BD[127.798] → [125.1651:1698]

B:BD[125.1698] → [76.37580:37610]

∅:D[76.37610] → [125.1729:1829]

B:BD[125.1729] → [125.1729:1829]

	keepBuild $_ foreach $jobset->builds->search(
	    { 'me.id' => { 'in' => \
	        [ "select b2.id from Builds b2 join " .
		  "  (select distinct job, system, coalesce( " .

[127.798]

[125.1829]

        keepBuild $_ foreach $jobset->builds->search(
            { 'me.id' => { 'in' => \
                [ "select b2.id from Builds b2 join " .
                  "  (select distinct job, system, coalesce( " .

Replacement in src/script/hydra-update-gc-roots at line 102 [124.472]

∅:D[9.107] → [125.2140:2487]

B:BD[125.2140] → [125.2140:2487]

		  "  on b2.project = ? and b2.jobset = ? and b2.job = x.job and b2.system = x.system and (id >= x.nth) where finished = 1 and buildStatus = 0"
		, [ '', $keepnr - 1 ], [ '', $project->name ], [ '', $jobset->name ], [ '', $project->name ], [ '', $jobset->name ] ] }
	    },
	    { order_by => ["job", "system", "id"], columns => [ @columns ] });

[9.107]

[130.3896]

                  "  on b2.project = ? and b2.jobset = ? and b2.job = x.job and b2.system = x.system and (id >= x.nth) where finished = 1 and buildStatus = 0"
                , [ '', $keepnr - 1 ], [ '', $project->name ], [ '', $jobset->name ], [ '', $project->name ], [ '', $jobset->name ] ] }
            },
            { order_by => ["job", "system", "id"], columns => [ @columns ] });

Replacement in src/script/hydra-update-gc-roots at line 142 [124.472]
B:BD[124.2267] → [125.2846:2864]
```
	$rootsDeleted++;
```
[124.2267]
[8.0]
```
        $rootsDeleted++;
```
Replacement in src/script/hydra-update-gc-roots at line 145 [124.472]
B:BD[125.2955] → [125.2955:2970]
```
	$rootsKept++;
```
[125.2955]
[124.2344]
```
        $rootsKept++;
```
Deletion in src/sql/hydra.sql at line 136 [131.1]
B:BD[131.266] → [131.266:299]
```
    outPath       text not null,
```
Insertion in src/sql/hydra.sql at line 176 [131.1]
[132.126]
[112.4847]
```
    --   6 = failure with output
```

Insertion in src/sql/hydra.sql at line 194 [131.1]

[133.2530]

[69.7124]

create table BuildOutputs (
    build         integer not null,
    name          text not null,
    path          text not null,
    primary key   (build, name),
    foreign key   (build) references Builds(id) on delete cascade
);

Deletion in src/sql/hydra.sql at line 210 [131.1]
∅:D[105.5426] → [69.7316:7340]
B:BD[69.7316] → [69.7316:7340]
```
    outPath       text,
```

Insertion in src/sql/hydra.sql at line 228 [131.1]

[69.7678]

[73.10076]

create table BuildStepOutputs (
    build         integer not null,
    stepnr        integer not null,
    name          text not null,
    path          text not null,
    primary key   (build, stepnr, name),
    foreign key   (build) references Builds(id) on delete cascade,
    foreign key   (build, stepnr) references BuildSteps(build, stepnr) on delete cascade
);

Replacement in src/sql/hydra.sql at line 516 [131.1]

B:BD[83.12428] → [83.12428:12468]

B:BD[83.12468] → [134.124:239]

∅:D[134.239] → [83.12550:12640]

B:BD[83.12550] → [83.12550:12640]

B:BD[83.12640] → [134.240:279]

    hostname text primary key NOT NULL,
    username text DEFAULT '' NOT NULL,
    ssh_key text DEFAULT '' NOT NULL,
    options text DEFAULT '' NOT NULL,
    maxconcurrent integer DEFAULT 2 NOT NULL,
    speedfactor integer DEFAULT 1 NOT NULL,
    enabled integer DEFAULT 0 NOT NULL

[83.12428]

[135.864]

    hostname text primary key not null,
    username text default '' not null,
    ssh_key text default '' not null,
    options text default '' not null,
    maxconcurrent integer default 2 not null,
    speedfactor integer default 1 not null,
    enabled integer default 0 not null

Deletion in src/sql/hydra.sql at line 540 [131.1]
B:BD[136.2466] → [136.2466:2524]
```
create index IndexBuildStepsOnBuild on BuildSteps(build);
```

Replacement in src/sql/hydra.sql at line 542 [131.1]

B:BD[137.96] → [137.96:158]

B:BD[137.158] → [77.559:634]

create index IndexBuildStepsOnOutpath on BuildSteps(outpath);
create index IndexBuildStepsOnOutpathBuild on BuildSteps (outpath, build);

[137.96]

[136.2524]

create index IndexBuildStepOutputsOnPath on BuildStepOutputs(path);

Add multiple output support

Dependencies

In channels

Change contents

Insertion in src/c/hydra-eval-jobs.cc at line 125 [15.303]

Deletion in src/c/hydra-eval-jobs.cc at line 132 [15.303]

Insertion in src/c/hydra-eval-jobs.cc at line 168 [15.303]

Replacement in src/lib/Hydra/Base/Controller/ListBuilds.pm at line 81 [19.1]

Insertion in src/lib/Hydra/Base/Controller/NixChannel.pm at line 6 [21.43]

Insertion in src/lib/Hydra/Base/Controller/NixChannel.pm at line 16 [21.43]

Replacement in src/lib/Hydra/Base/Controller/NixChannel.pm at line 18 [21.43]

Replacement in src/lib/Hydra/Base/Controller/NixChannel.pm at line 29 [21.43]

Insertion in src/lib/Hydra/Base/Controller/NixChannel.pm at line 32 [21.43]

Insertion in src/lib/Hydra/Base/Controller/NixChannel.pm at line 42 [21.43]

Insertion in src/lib/Hydra/Base/Controller/NixChannel.pm at line 65 [21.43]

Replacement in src/lib/Hydra/Base/Controller/NixChannel.pm at line 72 [21.43]

Replacement in src/lib/Hydra/Base/Controller/NixChannel.pm at line 121 [21.43]

Insertion in src/lib/Hydra/Controller/Build.pm at line 13 [27.1]

Insertion in src/lib/Hydra/Controller/Build.pm at line 33 [27.1]

Insertion in src/lib/Hydra/Controller/Build.pm at line 44 [27.1]

Replacement in src/lib/Hydra/Controller/Build.pm at line 58 [27.1]

Deletion in src/lib/Hydra/Controller/Build.pm at line 62 [27.1]

Replacement in src/lib/Hydra/Controller/Build.pm at line 67 [27.1]

Replacement in src/lib/Hydra/Controller/Build.pm at line 73 [27.1]

Replacement in src/lib/Hydra/Controller/Build.pm at line 299 [27.1]

Replacement in src/lib/Hydra/Controller/Build.pm at line 302 [27.1]

Replacement in src/lib/Hydra/Controller/Build.pm at line 305 [27.1]

Deletion in src/lib/Hydra/Controller/Build.pm at line 307 [27.1]

Replacement in src/lib/Hydra/Controller/Build.pm at line 308 [27.1]

Deletion in src/lib/Hydra/Controller/Build.pm at line 310 [27.1]

Replacement in src/lib/Hydra/Controller/Build.pm at line 312 [27.1]

Replacement in src/lib/Hydra/Controller/Build.pm at line 319 [27.1]

Deletion in src/lib/Hydra/Controller/Build.pm at line 324 [27.1]

Replacement in src/lib/Hydra/Controller/Build.pm at line 337 [27.1]

Replacement in src/lib/Hydra/Controller/Build.pm at line 339 [27.1]

Replacement in src/lib/Hydra/Controller/Build.pm at line 344 [27.1]

Replacement in src/lib/Hydra/Controller/Build.pm at line 398 [27.1]

Replacement in src/lib/Hydra/Controller/Build.pm at line 405 [27.1]

Deletion in src/lib/Hydra/Controller/Build.pm at line 409 [27.1]

Replacement in src/lib/Hydra/Controller/Build.pm at line 410 [27.1]