Merge branch 'queue-17'

[?]
Apr 13, 2010, 8:42 AM
OV7F5M3EQBESXVE3GGPXCTEBF2KZH6CUM6ZTXEF72HDSKRLUIZRAC

Dependencies

  • [2] A5V7HLIQ * Shut up DBIx::Class.
  • [3] JK2QWPH6
  • [4] AFTXA575 * $HYDRA_DATA environment variable.
  • [5] D6YQQQCN * Don't ignore SIGCHLD after all, Perl doesn't like it. Just do
  • [6] AHTEIK7G * Added a maintainers field to the Builds table.
  • [7] 7YBYT2LQ
  • [8] QZLMDKMU * Queue runner: don't start scheduled builds builds if they belong to
  • [9] TULPZ62Y * Perform builds in parallel.
  • [10] T7CCJQOF * Revert for now due to Postgres breakage.
  • [11] NREF6YOA * Don't start more builds concurrently than allowed for each system
  • [12] L2E6EVE2 * Merged the Build and Job tables.
  • [*] DQD7JMSU * Fix the terminology.

Change contents

  • replacement in src/script/hydra_queue_runner.pl at line 9
    [3.206][3.7877:7878](),[3.1139][3.7877:7878](),[3.7877][3.7877:7878]()
    [3.1139]
    [3.7878]
    use Nix;
  • edit in src/script/hydra_queue_runner.pl at line 53
    [3.8398]
    [3.8410]
    sub findBuildDependencyInQueue {
    my ($build) = @_;
    my $drvpath = $build->drvpath;
    my @paths = reverse(split '\n', `nix-store -qR $drvpath`);
    foreach my $path (@paths) {
    if($path ne $drvpath) {
    (my $depBuild) = $db->resultset('Builds')->search(
    { drvpath => $path, finished => 0, busy => 0, enabled => 1, disabled => 0 },
    { join => ['schedulingInfo', 'project'], rows => 1 } ) ;
    return $depBuild if defined $depBuild;
    }
    }
    return $build ;
    }
  • replacement in src/script/hydra_queue_runner.pl at line 80
    [3.110][3.8604:8605](),[2.111][3.8604:8605](),[3.235][3.8604:8605](),[3.600][3.8604:8605](),[3.11853][3.8604:8605](),[3.17989][3.8604:8605](),[3.8604][3.8604:8605]()
    [2.111]
    [3.236]
  • edit in src/script/hydra_queue_runner.pl at line 108
    [14.728]
    [14.728]
    $build = findBuildDependencyInQueue($build);