grahamc/hydra2 - Change JTRG7RDQXKPSO4ESGDLSVAT5WIFGKDL424MN6YYCVTKCOR2FTXRQC

add support for git as jobinput

Created by Rob Vermaas on November 17, 2009

JTRG7RDQXKPSO4ESGDLSVAT5WIFGKDL424MN6YYCVTKCOR2FTXRQC

Dependencies

In channels

main

Change contents

Insertion in release.nix at line 91 [5.1]

[3.425]

[4.531]

          cp ${"${nixpkgs}/pkgs/build-support/fetchgit/nix-prefetch-git"} $out/bin/nix-prefetch-git

Replacement in src/lib/Hydra/Controller/Jobset.pm at line 123 [7.104]
B:BD[6.1858] → [6.1858:1889]
```
        $inputType eq "build";
```
[6.1858]
[6.1889]
```
        $inputType eq "git" || $inputType eq "build";
```
Deletion in src/lib/Hydra/Helper/AddBuilds.pm at line 65 [6.2663]
B:BD[6.4415] → [6.4415:4416]
Replacement in src/lib/Hydra/Helper/AddBuilds.pm at line 66 [6.2663]
B:BD[6.4417] → [6.4417:4434]
```
sub fetchInput {
```
[6.4417]
[6.4434]
```
sub fetchInputPath {
```
Deletion in src/lib/Hydra/Helper/AddBuilds.pm at line 69 [6.2663]
B:BD[6.4495] → [6.4495:4522]
```
    if ($type eq "path") {
```
Replacement in src/lib/Hydra/Helper/AddBuilds.pm at line 127 [6.2663]
B:BD[6.6787] → [6.6787:6793]
```
    }
```
[6.6787]
[6.6793]
```
}
sub fetchInputSVN {
    my ($db, $project, $jobset, $name, $type, $value) = @_;
```
Deletion in src/lib/Hydra/Helper/AddBuilds.pm at line 132 [6.2663]
B:BD[6.6794] → [6.6794:6823]
```
    elsif ($type eq "svn") {
```
Replacement in src/lib/Hydra/Helper/AddBuilds.pm at line 181 [6.2663]
B:BD[6.8701] → [6.8701:8707]
```
    }
```
[6.8701]
[6.8707]
```
}
sub fetchInputBuild {
    my ($db, $project, $jobset, $name, $type, $value) = @_;
```
Deletion in src/lib/Hydra/Helper/AddBuilds.pm at line 186 [6.2663]
B:BD[6.8708] → [6.8708:8739]
```
    elsif ($type eq "build") {
```

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

[6.10008]

}
sub fetchInputGit {
    my ($db, $project, $jobset, $name, $type, $value) = @_;
    my $uri = $value;
    my $timestamp = time;
    my $sha256;
    my $storePath;
    # Some simple caching: don't check a path more than once every N seconds.
    (my $cachedInput) = $db->resultset('CachedGitInputs')->search(
	{uri => $uri, lastseen => {">", $timestamp - 3600}},
	{rows => 1, order_by => "lastseen DESC"});
    if (defined $cachedInput && isValidPath($cachedInput->storepath)) {
	$storePath = $cachedInput->storepath;
	$sha256 = $cachedInput->sha256hash;
	$timestamp = $cachedInput->timestamp;
    } else {
	# Then download this revision into the store.
	print STDERR "checking out Git input from $uri";
	$ENV{"NIX_HASH_ALGO"} = "sha256";
	$ENV{"PRINT_PATH"} = "1";
        my $stdout; my $stderr;
	(my $res, $stdout, $stderr) = captureStdoutStderr(
	    "nix-prefetch-git", $uri);
	die "Cannot check out Git repository `$uri':\n$stderr" unless $res;
	($sha256, $storePath) = split ' ', $stdout;
	($cachedInput) = $db->resultset('CachedGitInputs')->search(
	    {uri => $uri, sha256hash => $sha256});
	if (!defined $cachedInput) {
	    txn_do($db, sub {
		$db->resultset('CachedGitInputs')->create(
		    { uri => $uri
                    , timestamp => $timestamp
                    , lastseen => $timestamp
                    , sha256hash => $sha256
                    , storepath => $storePath
                    });
		   });
	} else {
	    $timestamp = $cachedInput->timestamp;
	    txn_do($db, sub {
		$cachedInput->update({lastseen => time});
	    });
	}

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

[6.10014]


    return
       { type => $type
       , uri => $uri
       , storePath => $storePath
       , sha256hash => $sha256
       , revision => strftime "%Y%m%d%H%M%S", gmtime($timestamp)
       };
}
sub fetchInputCVS {
    my ($db, $project, $jobset, $name, $type, $value) = @_;
}
sub fetchInput {
    my ($db, $project, $jobset, $name, $type, $value) = @_;
    if ($type eq "path") {
	return fetchInputPath($db, $project, $jobset, $name, $type, $value);
    }
    elsif ($type eq "svn") {
	return fetchInputSVN($db, $project, $jobset, $name, $type, $value);
    }
    elsif ($type eq "build") {
	return fetchInputBuild($db, $project, $jobset, $name, $type, $value);
    }
    elsif ($type eq "git") {
	return fetchInputGit($db, $project, $jobset, $name, $type, $value);
    }

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

B:BD[8.1790] → [8.1790:1840]

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

[8.1790]

[8.1840]

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

Replacement in src/lib/Hydra/Schema/BuildInputs.pm at line 53 [10.1]
B:BD[9.1271] → [9.1271:1299]
```
    data_type => "integer",
```
[9.1271]
[9.1299]
```
    data_type => "text",
```

Replacement in src/lib/Hydra/Schema/BuildInputs.pm at line 110 [10.1]

B:BD[11.25] → [12.172:317]

# Created by DBIx::Class::Schema::Loader v0.04999_09 @ 2009-10-23 16:56:03
# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:RTeBJCvspGfTdHUR/TxFsg

[11.25]

[10.781]

# Created by DBIx::Class::Schema::Loader v0.04999_09 @ 2009-11-17 16:04:13
# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:skn8HFEXTvEiL4/6Q+ulvw

Replacement in src/lib/Hydra/Schema/BuildProducts.pm at line 97 [13.4268]

B:BD[13.4922] → [12.405:550]

# Created by DBIx::Class::Schema::Loader v0.04999_09 @ 2009-10-23 16:56:03
# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:8FZKxfabZQfchVpHfvnVHA

[13.4922]

[13.5064]

# Created by DBIx::Class::Schema::Loader v0.04999_09 @ 2009-11-17 16:04:13
# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:6wJ0KJAILATio3ELRefU5Q

Replacement in src/lib/Hydra/Schema/BuildResultInfo.pm at line 92 [14.1594]

B:BD[14.2382] → [12.638:783]

# Created by DBIx::Class::Schema::Loader v0.04999_09 @ 2009-10-23 16:56:03
# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:496WClgIZB6hXV0zCsBjbQ

[14.2382]

[14.2524]

# Created by DBIx::Class::Schema::Loader v0.04999_09 @ 2009-11-17 16:04:13
# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:K+kKzTgAlKSXevJWtLIwGA

Replacement in src/lib/Hydra/Schema/BuildSchedulingInfo.pm at line 49 [14.3773]

B:BD[14.4473] → [12.871:1016]

# Created by DBIx::Class::Schema::Loader v0.04999_09 @ 2009-10-23 16:56:03
# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:giLh18QewdxF8Zi/5juWqA

[14.4473]

[14.4615]

# Created by DBIx::Class::Schema::Loader v0.04999_09 @ 2009-11-17 16:04:13
# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:eiaLNgxvTjSZGC4pMDtNWA

Replacement in src/lib/Hydra/Schema/BuildSteps.pm at line 97 [15.1675]

B:BD[15.2959] → [12.1104:1249]

# Created by DBIx::Class::Schema::Loader v0.04999_09 @ 2009-10-23 16:56:03
# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:5tx+fkjjKYUNYBYQS+kSOw

[15.2959]

# Created by DBIx::Class::Schema::Loader v0.04999_09 @ 2009-11-17 16:04:13
# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:5iUdHsNyEoM3D7i+tSteBQ

Replacement in src/lib/Hydra/Schema/Builds.pm at line 189 [13.5202]

B:BD[13.6194] → [16.344:489]

# Created by DBIx::Class::Schema::Loader v0.04999_09 @ 2009-10-26 14:22:27
# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:qbNPA5NkENlZXILuE3OGkA

[13.6194]

[11.62]

# Created by DBIx::Class::Schema::Loader v0.04999_09 @ 2009-11-17 16:04:13
# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:Un0iCqVS8PTpSdJiTjRXeA

Replacement in src/lib/Hydra/Schema/CachedPathInputs.pm at line 53 [17.859]

B:BD[17.1497] → [12.1599:1744]

# Created by DBIx::Class::Schema::Loader v0.04999_09 @ 2009-10-23 16:56:03
# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:vMJmHfs180MNWH9+pjS94g

[17.1497]

[17.1639]

# Created by DBIx::Class::Schema::Loader v0.04999_09 @ 2009-11-17 16:04:13
# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:ZEYeoP+fkE3y/cohKLoCLg

Replacement in src/lib/Hydra/Schema/CachedSubversionInputs.pm at line 46 [17.1780]

B:BD[17.2342] → [12.1832:1977]

# Created by DBIx::Class::Schema::Loader v0.04999_09 @ 2009-10-23 16:56:03
# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:3hG0+UX3MJMLjSTN29Le4Q

[17.2342]

[17.2484]

# Created by DBIx::Class::Schema::Loader v0.04999_09 @ 2009-11-17 16:04:13
# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:f3ZEnsrXJUjcpGkLNl24Rw

Replacement in src/lib/Hydra/Schema/Jobs.pm at line 81 [18.1454]

B:BD[18.2613] → [12.2065:2210]

# Created by DBIx::Class::Schema::Loader v0.04999_09 @ 2009-10-23 16:56:03
# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:bY5DYFb1G7JRyNFpGbWXwA

[18.2613]

[18.2755]

# Created by DBIx::Class::Schema::Loader v0.04999_09 @ 2009-11-17 16:04:13
# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:I5DYg9q22g99Mstln/26fw

Replacement in src/lib/Hydra/Schema/JobsetInputAlts.pm at line 54 [19.825]
B:BD[9.12118] → [9.12118:12146]
```
    data_type => "integer",
```
[9.12118]
[9.12146]
```
    data_type => "text",
```

Replacement in src/lib/Hydra/Schema/JobsetInputAlts.pm at line 75 [19.825]

B:BD[19.1831] → [12.2298:2443]

# Created by DBIx::Class::Schema::Loader v0.04999_09 @ 2009-10-23 16:56:03
# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:XPfPlym2UDd6gUr1aKrXhg

[19.1831]

[19.1973]

# Created by DBIx::Class::Schema::Loader v0.04999_09 @ 2009-11-17 16:04:13
# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:B2BMIuiQ3IAoqEJ18pHCeQ

Replacement in src/lib/Hydra/Schema/JobsetInputs.pm at line 71 [20.590]

B:BD[20.1681] → [12.2531:2676]

# Created by DBIx::Class::Schema::Loader v0.04999_09 @ 2009-10-23 16:56:03
# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:961DCIj2fAQFYAR6/SnJ8A

[20.1681]

[20.1823]

# Created by DBIx::Class::Schema::Loader v0.04999_09 @ 2009-11-17 16:04:13
# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:srhHJGx+LAdeo++jv1RmMg

Replacement in src/lib/Hydra/Schema/Jobsets.pm at line 117 [20.1960]

B:BD[20.2992] → [2.1593:1738]

# Created by DBIx::Class::Schema::Loader v0.04999_09 @ 2009-11-17 14:04:55
# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:xWsqXneZw90uEw/vcEXc4w

[20.2992]

[20.3134]

# Created by DBIx::Class::Schema::Loader v0.04999_09 @ 2009-11-17 16:05:10
# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:fVXvhb343Zw1625daVz40g

Replacement in src/lib/Hydra/Schema/Projects.pm at line 97 [20.3266]

B:BD[20.3685] → [2.1867:2012]

# Created by DBIx::Class::Schema::Loader v0.04999_09 @ 2009-11-17 14:04:55
# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:dWe2DEsuZuOjVj4IA8TwQg

[20.3685]

[20.3827]

# Created by DBIx::Class::Schema::Loader v0.04999_09 @ 2009-11-17 16:05:10
# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:+HDJ8tIPcvj5+IwgHqTnaw

Replacement in src/lib/Hydra/Schema/ReleaseMembers.pm at line 56 [21.1847]

B:BD[21.2936] → [12.3230:3375]

# Created by DBIx::Class::Schema::Loader v0.04999_09 @ 2009-10-23 16:56:03
# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:DvQQfFaVP0ci1LMKfbl3tg

[21.2936]

[21.3081]

# Created by DBIx::Class::Schema::Loader v0.04999_09 @ 2009-11-17 16:04:13
# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:fu21YcmM1U76pcgFY1qZ5A

Replacement in src/lib/Hydra/Schema/Releases.pm at line 56 [21.3220]

B:BD[21.4209] → [12.3463:3608]

# Created by DBIx::Class::Schema::Loader v0.04999_09 @ 2009-10-23 16:56:03
# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:zG8H+WLuEnvPl9UEJ3yyCQ

[21.4209]

[21.4354]

# Created by DBIx::Class::Schema::Loader v0.04999_09 @ 2009-11-17 16:04:13
# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:cbt+hnRoIN5T6u8qC9uQBg

Replacement in src/lib/Hydra/Schema/SystemTypes.pm at line 27 [22.1717]

B:BD[22.2105] → [12.3696:3841]

# Created by DBIx::Class::Schema::Loader v0.04999_09 @ 2009-10-23 16:56:03
# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:7HmnBjVA60uMDrV2Bc9TmA

[22.2105]

[22.2247]

# Created by DBIx::Class::Schema::Loader v0.04999_09 @ 2009-11-17 16:04:13
# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:QtiooD8Th7dBKknK5IRhMQ

Replacement in src/lib/Hydra/Schema/UserRoles.pm at line 34 [23.3263]

B:BD[23.3736] → [12.3929:4074]

# Created by DBIx::Class::Schema::Loader v0.04999_09 @ 2009-10-23 16:56:03
# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:l4FwcyoQw1cpvc+QKt6W7Q

[23.3736]

[23.3878]

# Created by DBIx::Class::Schema::Loader v0.04999_09 @ 2009-11-17 16:04:13
# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:9oO99uYxlWqY3GxfUWjNzg

Replacement in src/lib/Hydra/Schema/Users.pm at line 56 [24.3258]

B:BD[24.3782] → [12.4162:4307]

# Created by DBIx::Class::Schema::Loader v0.04999_09 @ 2009-10-23 16:56:03
# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:FSfQfOaAf2oeQeFtBI7HoQ

[24.3782]

[24.3924]

# Created by DBIx::Class::Schema::Loader v0.04999_09 @ 2009-11-17 16:04:13
# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:oBiKpCxHGZcGujhY/ZbbxA

Replacement in src/lib/Hydra/Schema/ViewJobs.pm at line 72 [25.5076]

B:BD[25.6070] → [12.4395:4540]

# Created by DBIx::Class::Schema::Loader v0.04999_09 @ 2009-10-23 16:56:03
# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:FqMPRQo5hyHDy6zZIqdR5w

[25.6070]

[25.6212]

# Created by DBIx::Class::Schema::Loader v0.04999_09 @ 2009-11-17 16:04:13
# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:RX9tEuV8mEg13dxEe9SJrQ

Replacement in src/lib/Hydra/Schema/Views.pm at line 48 [25.6351]

B:BD[25.7142] → [12.4628:4773]

# Created by DBIx::Class::Schema::Loader v0.04999_09 @ 2009-10-23 16:56:03
# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:DVmiIWbS8/PBOMvjjmns6g

[25.7142]

[25.7284]

# Created by DBIx::Class::Schema::Loader v0.04999_09 @ 2009-11-17 16:04:13
# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:BnM3PKkdJXAaT4rPR8gJsQ

Replacement in src/lib/Hydra/Schema.pm at line 14 [13.6376]

B:BD[13.6498] → [12.4861:5006]

# Created by DBIx::Class::Schema::Loader v0.04999_09 @ 2009-10-23 16:56:03
# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:s5XNrT7kEVqbLED5g/J/SA

[13.6498]

[13.6640]

# Created by DBIx::Class::Schema::Loader v0.04999_09 @ 2009-11-17 16:04:13
# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:Y97NEH6tnsRjsy0/nVgMjQ

Insertion in src/root/common.tt at line 8 [26.2803]
[26.2885]
[26.2885]
```
    , "git" = "Git checkout"
```

Replacement in src/sql/hydra.sql at line 75 [28.1]

B:BD[27.6536] → [27.6536:6584]

    revision      integer, -- for type == 'svn'

[27.6536]

[27.6584]

    revision      text, -- for type == 'svn'

Replacement in src/sql/hydra.sql at line 242 [28.1]
B:BD[10.2754] → [10.2754:2781]
```
    revision      integer,
```
[10.2754]
[10.2781]
```
    revision      text,
```

Insertion in src/sql/hydra.sql at line 293 [28.1]

[17.5623]

[22.2956]

);
create table CachedGitInputs (
    uri           text not null,
    timestamp     integer not null, -- when we first saw this hash
    lastSeen      integer not null, -- when we last saw this hash
    sha256hash    text not null,
    storePath     text not null,
    primary key   (uri, sha256hash)
);
create table CachedCVSInputs (
    uri           text not null,
    module        text not null,
    revision      integer not null,
    timestamp     integer not null, -- when we first saw this hash
    lastSeen      integer not null, -- when we last saw this hash
    sha256hash    text not null,
    storePath     text not null,
    primary key   (uri, module, sha256hash)