grahamc/hydra - Change YFPZ46YK4BOI6VH2H3F757UEGEYONURUAEDAYEIBLRY33PLSSO4AC

* hydra: added variant of build input type, 'build output (same system)' to allow better continous integration in one jobset for multiple system. it makes sure that the system of the build that is passed as input for a job has the same system as the job.

Created by Rob Vermaas on January 19, 2010

YFPZ46YK4BOI6VH2H3F757UEGEYONURUAEDAYEIBLRY33PLSSO4AC

Dependencies

In channels

upstream

main

Change contents

Insertion in deps.nix at line 22 [5.1]

[2.30]

[5.497]

  perlPackages.PadWalker
  perlPackages.DataDump

Replacement in src/lib/Hydra/Controller/Jobset.pm at line 123 [8.104]

B:BD[6.1858] → [7.101:155]

        $inputType eq "git" || $inputType eq "build";

[6.1858]

[6.1889]

        $inputType eq "git" || $inputType eq "build" || $inputType eq "sysbuild" ;

Insertion in src/lib/Hydra/Helper/AddBuilds.pm at line 216 [6.2663]

[6.10008]

[7.348]

}
sub fetchInputSystemBuild {
    my ($db, $project, $jobset, $name, $type, $value) = @_;
        my ($projectName, $jobsetName, $jobName, $attrs) = parseJobName($value);
        $projectName ||= $project->name;
        $jobsetName ||= $jobset->name;
        my @latestBuilds = $db->resultset('LatestSucceededForJob')
          ->search({}, {bind => [$projectName, $jobsetName, $jobName]});
        my @validBuilds = ();
        foreach my $build (@latestBuilds) {
        	if(isValidPath($build->outpath)) {
        		push(@validBuilds,$build);
        	}
        }
        
        if (scalar(@validBuilds) == 0) {
            print STDERR "input `", $name, "': no previous build available\n";
            return undef;
        }
		my @inputs = ();
        foreach my $prevBuild (@validBuilds) {
	        my $pkgNameRE = "(?:(?:[A-Za-z0-9]|(?:-[^0-9]))+)";
	        my $versionRE = "(?:[A-Za-z0-9\.\-]+)";
	
	        my $relName = ($prevBuild->resultInfo->releasename or $prevBuild->nixname);
	        my $version = $2 if $relName =~ /^($pkgNameRE)-($versionRE)$/;
	        
	        my $input =
	            { type => "sysbuild"
	            , storePath => $prevBuild->outpath
	            , id => $prevBuild->id
	            , version => $version
	            , system => $prevBuild->system
	            };
	        push(@inputs, $input);
		}
		return @inputs;

Insertion in src/lib/Hydra/Helper/AddBuilds.pm at line 362 [6.2663]

[7.2591]

    }
    elsif ($type eq "sysbuild") {
	return fetchInputSystemBuild($db, $project, $jobset, $name, $type, $value);

Replacement in src/lib/Hydra/Helper/AddBuilds.pm at line 399 [6.2663]

B:BD[9.1790] → [7.2702:2766]

                when (["svn", "path", "build", "git", "cvs"]) {

[9.1790]

[9.1840]

                when (["svn", "path", "build", "git", "cvs", "sysbuild"]) {

Insertion in src/lib/Hydra/Helper/AddBuilds.pm at line 445 [6.2663]

[9.3393]

    my @filteredJobs = ();
    foreach my $job (@{$jobs->{job}}) {
    	my $validJob = 1;
  		foreach my $arg (@{$job->{arg}}) {
  			my $input = $inputInfo->{$arg->{name}}->[$arg->{altnr}] ;
  			if($input->{type} eq "sysbuild" && ! ($input->{system} eq $job->{system}) ) {
  				$validJob = 0 ;
  			}
    	}
    	if($validJob) {
    	  push(@filteredJobs, $job);
    	}    	
    }
    $jobs->{job} = \@filteredJobs;

Replacement in src/root/build.tt at line 258 [11.7350]

B:BD[10.1542] → [10.1542:1583]

          [% IF input.type == "build" %]

[10.1542]

[12.642]

          [% IF input.type == "build" || input.type == "sysbuild" %]

Replacement in src/root/clone-build.tt at line 37 [13.728]

B:BD[13.1922] → [4.0:45]

              [% IF input.type == "build" %]

[13.1922]

[4.45]

              [% IF input.type == "build" || input.type == "sysbuild" %]

Insertion in src/root/common.tt at line 14 [14.2803]
[14.3018]
[14.3018]
```
    , "sysbuild" = "Build output (same system)"
```
Replacement in src/script/hydra_build.pl at line 17 [17.2912]
∅:D[15.21] → [16.0:1]
∅:D[18.25] → [16.0:1]
∅:D[2.55] → [16.0:1]
∅:D[19.69] → [16.0:1]
∅:D[20.399] → [16.0:1]
B:BD[21.1070] → [16.0:1]
[2.55]
[17.2987]
```
use Data::Dump qw(dump);
```

Replacement in src/script/hydra_build.pl at line 141 [17.2912]

B:BD[19.1425] → [19.1425:1463]

            , $input->type eq "build"

[19.1425]

[19.1463]

            , ( $input->type eq "build" || $input->type eq "sysbuild")

Replacement in src/script/hydra_scheduler.pl at line 16 [22.1319]
∅:D[16.48] → [22.1392:1393]
∅:D[3.417] → [22.1392:1393]
∅:D[23.492] → [22.1392:1393]
∅:D[24.1597] → [22.1392:1393]
∅:D[25.1994] → [22.1392:1393]
∅:D[26.5673] → [22.1392:1393]
B:BD[22.1392] → [22.1392:1393]
[3.417]
[3.418]
```
use Data::Dump qw(dump);
```

Replacement in src/script/hydra_scheduler.pl at line 27 [22.1319]

B:BD[27.646] → [6.10947:11047]

∅:D[6.11047] → [28.1340:1411]

B:BD[28.1340] → [28.1340:1411]

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

[27.646]

[27.722]

        	if($input->type eq "sysbuild") {
              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;
              }
        	} else {
              my $info = fetchInput($db, $project, $jobset, $input->name, $input->type, $alt->value);
              push @{$$inputInfo{$input->name}}, $info if defined $info;
        	}