grahamc/hydra - Change FM4O2L4MNPCHWRDRHKGKSH5TFFX6R2RMCPEQ3XCECA6UVLJPLUVQC

hydra: if evaluator sees cached build, also add the buildproducts

Created by Rob Vermaas on September 7, 2010

FM4O2L4MNPCHWRDRHKGKSH5TFFX6R2RMCPEQ3XCECA6UVLJPLUVQC

Dependencies

In channels

upstream

main

Change contents

Insertion in src/lib/Hydra/Helper/AddBuilds.pm at line 588 [5.2663]

[4.3430]


sub addBuildProducts {
    my ($db, $build) = @_;
    my $outPath = $build->outpath;
    my $productnr = 1;
    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;
                    my $fileSize, my $sha1, my $sha256;
                    # !!! validate $path, $defaultPath

Insertion in src/lib/Hydra/Helper/AddBuilds.pm at line 609 [5.2663]

[4.3431]

                    if (-f $path) {
                        my $st = stat($path) or die "cannot stat $path: $!";
                        $fileSize = $st->size;
                        
                        $sha1 = `nix-hash --flat --type sha1 $path`
                            or die "cannot hash $path: $?";;
                        chomp $sha1;
                    
                        $sha256 = `nix-hash --flat --type sha256 $path`
                            or die "cannot hash $path: $?";;
                        chomp $sha256;
                    }

Insertion in src/lib/Hydra/Helper/AddBuilds.pm at line 622 [5.2663]

[4.3432]

                    my $name = $path eq $outPath ? "" : basename $path;
                    
                    $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;
            }
            else {
                $db->resultset('BuildProducts')->create(
                    { build => $build->id
                    , productnr => $productnr++
                    , type => "nix-build"
                    , subtype => ""
                    , path => $outPath
                    , name => $build->nixname
                    });
            }
}

Insertion in src/lib/Hydra/Helper/AddBuilds.pm at line 731 [5.2663]
[3.987]
[3.987]
```
            addBuildProducts($build);
```

Replacement in src/lib/Hydra/Helper/CatalystUtils.pm at line 120 [8.3469]

∅:D[6.2194] → [7.941:991]

B:BD[7.941] → [7.941:991]

B:BD[7.991] → [2.50:94]

        next unless isValidPath($build->outpath);
        if (isValidPath($build->drvpath)) {

[6.2194]

[2.94]

        next unless Hydra::Helper::Nix::isValidPath($build->outpath);
        if (Hydra::Helper::Nix::isValidPath($build->drvpath)) {

Replacement in src/script/hydra_build.pl at line 386 [10.2912]

∅:D[9.4577] → [10.5155:5156]

B:BD[10.5155] → [10.5155:5156]

B:BD[11.3734] → [11.3734:3765]

B:BD[10.5639] → [10.5639:5818]

B:BD[10.5818] → [12.3316:3390]

∅:D[13.2753] → [10.5875:5910]

∅:D[12.3390] → [10.5875:5910]

B:BD[10.5875] → [10.5875:5910]

B:BD[10.5910] → [13.2754:2812]

∅:D[13.2812] → [10.5948:5983]

B:BD[10.5948] → [10.5948:5983]

B:BD[10.5983] → [12.3391:3433]

∅:D[12.3433] → [14.0:42]

B:BD[10.5983] → [14.0:42]

∅:D[14.42] → [11.3766:3767]

B:BD[10.6024] → [11.3766:3767]

B:BD[11.3767] → [15.1176:1232]

∅:D[15.1232] → [11.3840:3841]

B:BD[11.3840] → [11.3840:3841]

B:BD[11.3841] → [12.3434:3490]

∅:D[12.3490] → [15.1233:1346]

B:BD[11.3841] → [15.1233:1346]

B:BD[15.1346] → [13.2813:2860]

∅:D[13.2860] → [15.1387:1578]

B:BD[15.1387] → [15.1387:1578]

∅:D[15.1578] → [11.3998:4019]

B:BD[11.3998] → [11.3998:4019]

B:BD[11.4019] → [15.1579:1773]

B:BD[15.1773] → [12.3491:3564]

∅:D[15.1773] → [11.4182:4203]

∅:D[12.3564] → [11.4182:4203]

B:BD[11.4182] → [11.4182:4203]

B:BD[11.4203] → [16.4983:5044]

∅:D[16.5044] → [10.6085:6131]

B:BD[10.6085] → [10.6085:6131]

B:BD[10.6131] → [11.4204:4256]

∅:D[11.4256] → [10.6131:6257]

B:BD[10.6131] → [10.6131:6257]

B:BD[10.6257] → [15.1774:1822]

∅:D[15.1822] → [11.4305:4397]

B:BD[11.4305] → [11.4305:4397]

B:BD[11.4397] → [12.3565:3659]

∅:D[12.3659] → [10.6257:6331]

∅:D[11.4446] → [10.6257:6331]

B:BD[10.6257] → [10.6257:6331]

B:BD[10.6331] → [11.4447:4462]

B:BD[11.4462] → [9.4578:4597]

B:BD[9.4597] → [16.5045:5102]

∅:D[16.5102] → [10.6409:6451]

B:BD[10.6409] → [10.6409:6451]

B:BD[10.6451] → [11.4503:4551]

∅:D[11.4551] → [10.6451:6568]

B:BD[10.6451] → [10.6451:6568]

B:BD[10.6568] → [13.2861:2907]

∅:D[13.2907] → [10.6568:6606]

B:BD[10.6568] → [10.6568:6606]


            my $productnr = 1;
            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;
                    my $fileSize, my $sha1, my $sha256;
                    # !!! validate $path, $defaultPath
                    if (-f $path) {
                        my $st = stat($path) or die "cannot stat $path: $!";
                        $fileSize = $st->size;
                        
                        $sha1 = `nix-hash --flat --type sha1 $path`
                            or die "cannot hash $path: $?";;
                        chomp $sha1;
                    
                        $sha256 = `nix-hash --flat --type sha256 $path`
                            or die "cannot hash $path: $?";;
                        chomp $sha256;
                    }
                    my $name = $path eq $outPath ? "" : basename $path;
                    
                    $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;
            }
            else {
                $db->resultset('BuildProducts')->create(
                    { build => $build->id
                    , productnr => $productnr++
                    , type => "nix-build"
                    , subtype => ""
                    , path => $outPath
                    , name => $build->nixname
                    });
            }

[9.4577]

[10.6606]

            addBuildProducts($db, $build);