grahamc/hydra2 - Change WQXF2T3DFC2K72OVX46TUQ4IMZNJ5BSBQ7L7AVI7QL54DXCBEKLQC

hydra-evaluator: Don't require $HYDRA_CONFIG

Created by Eelco Dolstra on January 22, 2013

WQXF2T3DFC2K72OVX46TUQ4IMZNJ5BSBQ7L7AVI7QL54DXCBEKLQC

Dependencies

In channels

main

Change contents

Replacement in src/lib/Hydra/Helper/Nix.pm at line 12 [11.436]
B:BD[10.619] → [5.100:137]
```
    getHydraHome getHydraConf txn_do
```
[10.619]
[12.665]
```
    getHydraHome getHydraConfig txn_do
```
Replacement in src/lib/Hydra/Helper/Nix.pm at line 26 [11.436]
∅:D[13.2636] → [14.145:164]
B:BD[14.145] → [14.145:164]
```
sub getHydraConf {
```
[13.2636]
[5.138]
```
sub getHydraConfig {
```

Replacement in src/lib/Hydra/Helper/Nix.pm at line 28 [11.436]

∅:D[5.227] → [15.631:706]

B:BD[15.631] → [15.631:706]

∅:D[15.706] → [14.306:324]

B:BD[14.306] → [14.306:324]

    die "The HYDRA_CONFIG file ($conf) does not exist!\n" unless -f $conf;
    return $conf;

[5.227]

[16.520]

    return {} unless -f $conf;
    my %config = new Config::General($conf)->getall;
    return \%config;

Insertion in src/script/hydra-build at line 27 [18.2912]
[17.23]
[17.23]
```
my $config = getHydraConfig();
```
Deletion in src/script/hydra-build at line 29 [18.2912]
B:BD[17.24] → [14.325:381]
```
my %config = new Config::General(getHydraConf)->getall;
```

Replacement in src/script/hydra-build at line 35 [18.2912]

B:BD[19.193] → [20.0:46]

    my $addURL = defined $config{'base_uri'};

[19.193]

[19.247]

    my $addURL = defined $config->{'base_uri'};

Replacement in src/script/hydra-build at line 41 [18.2912]
∅:D[21.819] → [20.47:104]
∅:D[22.9718] → [20.47:104]
B:BD[19.559] → [20.47:104]
```
    my $url = $config{'base_uri'}."/build/".$build->id ;
```
[21.819]
[23.400]
```
    my $url = $config->{'base_uri'}."/build/".$build->id ;
```
Replacement in src/script/hydra-build at line 86 [18.2912]
B:BD[24.3863] → [24.3863:3899]
```
	{ project => $build->project->name
```
[24.3863]
[24.3899]
```
        { project => $build->project->name
```
Replacement in src/script/hydra-build at line 93 [18.2912]
∅:D[8.54] → [25.36:68]
B:BD[25.36] → [25.36:68]
```
	}, { order_by => ["id DESC"] }
```
[8.54]
[24.4113]
```
        }, { order_by => ["id DESC"] }
```
Replacement in src/script/hydra-build at line 115 [18.2912]
∅:D[3.34] → [26.0:51]
∅:D[27.465] → [26.0:51]
B:BD[28.662] → [26.0:51]
```
    my $sender = $config{'notification_sender'} ||
```
[3.34]
[3.35]
```
    my $sender = $config->{'notification_sender'} ||
```

Replacement in src/script/hydra-build at line 118 [18.2912]

B:BD[18.3076] → [17.87:153]

    my $selfURI = $config{'base_uri'} || "http://localhost:3000";

[18.3076]

[29.131]

    my $selfURI = $config->{'base_uri'} || "http://localhost:3000";

Replacement in src/script/hydra-build at line 238 [18.2912]

B:BD[30.5001] → [4.0:62]

	# Note: `--timeout' was added in Nix 1.0pre27564, June 2011.

[30.5001]

[31.0]

        # Note: `--timeout' was added in Nix 1.0pre27564, June 2011.

Replacement in src/script/hydra-build at line 240 [18.2912]
B:BD[31.52] → [4.63:92]
```
	    "--timeout $timeout " .
```
[31.52]
[32.1198]
```
            "--timeout $timeout " .
```
Replacement in src/script/hydra-build at line 262 [18.2912]
B:BD[30.5462] → [33.0:24]
```
		my $drvPathStep = $1;
```
[30.5462]
[34.940]
```
                my $drvPathStep = $1;
```
Replacement in src/script/hydra-build at line 279 [18.2912]
B:BD[35.906] → [35.906:926]
```
		my $machine = $2;
```
[35.906]
[35.926]
```
                my $machine = $2;
```
Replacement in src/script/hydra-build at line 284 [18.2912]
B:BD[35.1141] → [35.1141:1148]
```
	    }
```
[35.1141]
[21.1095]
```
            }
```

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

B:BD[36.621] → [7.250:327]

∅:D[7.327] → [21.1143:1175]

B:BD[37.229] → [21.1143:1175]

	    my ($deriver, $hash, $time, $narSize, $refs) = queryPathInfo($path, 0);
 	    $closuresize += $narSize;

[36.621]

[36.736]

            my ($deriver, $hash, $time, $narSize, $refs) = queryPathInfo($path, 0);
            $closuresize += $narSize;

Replacement in src/script/hydra-build at line 449 [18.2912]

∅:D[38.8046] → [39.8026:8088]

B:BD[39.8026] → [39.8026:8088]

B:BD[39.8088] → [22.10892:10951]

    die "build $buildId doesn't exist" unless defined $build;
    die "build $buildId already done" if $build->finished;

[38.8046]

[40.6555]

    die "build $buildId doesn't exist\n" unless defined $build;
    die "build $buildId already done\n" if $build->finished;

Replacement in src/script/hydra-evaluator at line 21 [41.1319]
∅:D[5.745] → [14.382:438]
B:BD[16.1793] → [14.382:438]
```
my %config = new Config::General(getHydraConf)->getall;
```
[5.745]
[42.5400]
```
my $config = getHydraConfig();
```

Replacement in src/script/hydra-evaluator at line 28 [41.1319]

B:BD[43.646] → [44.932:1134]

	    my @info = fetchInput($db, $project, $jobset, $input->name, $input->type, $alt->value);
	    foreach my $info_el (@info) {
		push @{$$inputInfo{$input->name}}, $info_el if defined $info_el;
	    }

[43.646]

[43.722]

            my @info = fetchInput($db, $project, $jobset, $input->name, $input->type, $alt->value);
            foreach my $info_el (@info) {
                push @{$$inputInfo{$input->name}}, $info_el if defined $info_el;
            }

Replacement in src/script/hydra-evaluator at line 44 [41.1319]

B:BD[45.3184] → [46.485:539]

    sendJobsetErrorNotification($jobset, $errorMsg);

[45.3184]

    sendJobsetErrorNotification($jobset, $errorMsg);

Replacement in src/script/hydra-evaluator at line 52 [41.1319]
B:BD[46.670] → [2.66:98]
```
    return if $errorMsg eq ""; 
```
[46.670]
[47.1179]
```
    return if $errorMsg eq "";
```

Replacement in src/script/hydra-evaluator at line 58 [41.1319]

B:BD[47.1181] → [46.754:805]

    my $sender = $config{'notification_sender'} ||

[47.1181]

[27.1040]

    my $sender = $config->{'notification_sender'} ||

Replacement in src/script/hydra-evaluator at line 79 [41.1319]
B:BD[27.1225] → [27.1225:1237]
```
        ], 
```
[27.1225]
[48.51]
```
        ],
```

Replacement in src/script/hydra-evaluator at line 93 [41.1319]

B:BD[49.114] → [49.114:166]

        my $k = int(rand($n + 1)); # 0 <= $k <= $n

[49.114]

[49.166]

        my $k = int(rand($n + 1)); # 0 <= $k <= $n

Replacement in src/script/hydra-evaluator at line 104 [41.1319]
∅:D[9.11455] → [50.2021:2026]
B:BD[47.3692] → [50.2021:2026]
```
    
```
[9.11455]
[43.2113]
Replacement in src/script/hydra-evaluator at line 123 [41.1319]
B:BD[51.2565] → [51.2565:2570]
```
    
```
[51.2565]
[43.2191]
Replacement in src/script/hydra-evaluator at line 132 [41.1319]
B:BD[34.1623] → [52.5269:5278]
```
        
```
[34.1623]
[53.394]
Replacement in src/script/hydra-evaluator at line 154 [41.1319]
B:BD[54.2033] → [54.2033:2042]
```
        
```
[54.2033]
[55.2516]
Replacement in src/script/hydra-evaluator at line 176 [41.1319]
B:BD[6.3185] → [6.3185:3198]
```
            
```
[6.3185]
[6.3198]
Replacement in src/script/hydra-evaluator at line 193 [41.1319]
B:BD[42.6534] → [6.3961:3973]
```
           
```
[42.6534]
[53.455]
Replacement in src/script/hydra-evaluator at line 201 [41.1319]
B:BD[52.5858] → [52.5858:5866]
```
       
```
[52.5858]
[55.2775]
Replacement in src/script/hydra-evaluator at line 224 [41.1319]
B:BD[54.2101] → [54.2101:2106]
```
    
```
[54.2101]
[55.2841]
Replacement in src/script/hydra-evaluator at line 226 [41.1319]
∅:D[55.2923] → [54.2184:2189]
B:BD[54.2184] → [54.2184:2189]
```
    
```
[55.2923]
[54.2189]
Replacement in src/script/hydra-evaluator at line 230 [41.1319]
B:BD[54.2247] → [54.2247:2252]
```
    
```
[54.2247]
[54.2252]

hydra-evaluator: Don't require $HYDRA_CONFIG

Dependencies

In channels

Change contents

Replacement in src/lib/Hydra/Helper/Nix.pm at line 12 [11.436]

Replacement in src/lib/Hydra/Helper/Nix.pm at line 26 [11.436]

Replacement in src/lib/Hydra/Helper/Nix.pm at line 28 [11.436]

Insertion in src/script/hydra-build at line 27 [18.2912]

Deletion in src/script/hydra-build at line 29 [18.2912]

Replacement in src/script/hydra-build at line 35 [18.2912]

Replacement in src/script/hydra-build at line 41 [18.2912]

Replacement in src/script/hydra-build at line 86 [18.2912]

Replacement in src/script/hydra-build at line 93 [18.2912]

Replacement in src/script/hydra-build at line 115 [18.2912]

Replacement in src/script/hydra-build at line 118 [18.2912]

Replacement in src/script/hydra-build at line 238 [18.2912]

Replacement in src/script/hydra-build at line 240 [18.2912]

Replacement in src/script/hydra-build at line 262 [18.2912]

Replacement in src/script/hydra-build at line 279 [18.2912]

Replacement in src/script/hydra-build at line 284 [18.2912]

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

Replacement in src/script/hydra-build at line 449 [18.2912]

Replacement in src/script/hydra-evaluator at line 21 [41.1319]

Replacement in src/script/hydra-evaluator at line 28 [41.1319]

Replacement in src/script/hydra-evaluator at line 44 [41.1319]

Replacement in src/script/hydra-evaluator at line 52 [41.1319]

Replacement in src/script/hydra-evaluator at line 58 [41.1319]

Replacement in src/script/hydra-evaluator at line 79 [41.1319]

Replacement in src/script/hydra-evaluator at line 93 [41.1319]

Replacement in src/script/hydra-evaluator at line 104 [41.1319]

Replacement in src/script/hydra-evaluator at line 123 [41.1319]

Replacement in src/script/hydra-evaluator at line 132 [41.1319]

Replacement in src/script/hydra-evaluator at line 154 [41.1319]

Replacement in src/script/hydra-evaluator at line 176 [41.1319]

Replacement in src/script/hydra-evaluator at line 193 [41.1319]

Replacement in src/script/hydra-evaluator at line 201 [41.1319]

Replacement in src/script/hydra-evaluator at line 224 [41.1319]

Replacement in src/script/hydra-evaluator at line 226 [41.1319]

Replacement in src/script/hydra-evaluator at line 230 [41.1319]