* Clean up indentation.
This commit is contained in:
Eelco Dolstra
parent
7daca03e78
commit
da25c963eb
|
|
@ -63,200 +63,204 @@ sub attrsToSQL {
|
||||||
return $query;
|
return $query;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
sub fetchInputPath {
|
sub fetchInputPath {
|
||||||
my ($db, $project, $jobset, $name, $type, $value) = @_;
|
my ($db, $project, $jobset, $name, $type, $value) = @_;
|
||||||
|
|
||||||
my $uri = $value;
|
my $uri = $value;
|
||||||
|
|
||||||
my $timestamp = time;
|
my $timestamp = time;
|
||||||
my $sha256;
|
my $sha256;
|
||||||
my $storePath;
|
my $storePath;
|
||||||
|
|
||||||
# Some simple caching: don't check a path more than once every N seconds.
|
# Some simple caching: don't check a path more than once every N seconds.
|
||||||
(my $cachedInput) = $db->resultset('CachedPathInputs')->search(
|
(my $cachedInput) = $db->resultset('CachedPathInputs')->search(
|
||||||
{srcpath => $uri, lastseen => {">", $timestamp - 30}},
|
{srcpath => $uri, lastseen => {">", $timestamp - 30}},
|
||||||
{rows => 1, order_by => "lastseen DESC"});
|
{rows => 1, order_by => "lastseen DESC"});
|
||||||
|
|
||||||
if (defined $cachedInput && isValidPath($cachedInput->storepath)) {
|
if (defined $cachedInput && isValidPath($cachedInput->storepath)) {
|
||||||
$storePath = $cachedInput->storepath;
|
$storePath = $cachedInput->storepath;
|
||||||
$sha256 = $cachedInput->sha256hash;
|
$sha256 = $cachedInput->sha256hash;
|
||||||
$timestamp = $cachedInput->timestamp;
|
$timestamp = $cachedInput->timestamp;
|
||||||
|
} else {
|
||||||
|
|
||||||
|
print STDERR "copying input ", $name, " from $uri\n";
|
||||||
|
$storePath = `nix-store --add "$uri"`
|
||||||
|
or die "Cannot copy path $uri to the Nix store.\n";
|
||||||
|
chomp $storePath;
|
||||||
|
|
||||||
|
$sha256 = getStorePathHash $storePath;
|
||||||
|
|
||||||
|
($cachedInput) = $db->resultset('CachedPathInputs')->search(
|
||||||
|
{srcpath => $uri, sha256hash => $sha256});
|
||||||
|
|
||||||
|
# Path inputs don't have a natural notion of a "revision", so
|
||||||
|
# we simulate it by using the timestamp that we first saw this
|
||||||
|
# path have this SHA-256 hash. So if the contents of the path
|
||||||
|
# changes, we get a new "revision", but if it doesn't change
|
||||||
|
# (or changes back), we don't get a new "revision".
|
||||||
|
if (!defined $cachedInput) {
|
||||||
|
txn_do($db, sub {
|
||||||
|
$db->resultset('CachedPathInputs')->create(
|
||||||
|
{ srcpath => $uri
|
||||||
|
, timestamp => $timestamp
|
||||||
|
, lastseen => $timestamp
|
||||||
|
, sha256hash => $sha256
|
||||||
|
, storepath => $storePath
|
||||||
|
});
|
||||||
|
});
|
||||||
} else {
|
} else {
|
||||||
|
$timestamp = $cachedInput->timestamp;
|
||||||
print STDERR "copying input ", $name, " from $uri\n";
|
txn_do($db, sub {
|
||||||
$storePath = `nix-store --add "$uri"`
|
$cachedInput->update({lastseen => time});
|
||||||
or die "Cannot copy path $uri to the Nix store.\n";
|
});
|
||||||
chomp $storePath;
|
|
||||||
|
|
||||||
$sha256 = getStorePathHash $storePath;
|
|
||||||
|
|
||||||
($cachedInput) = $db->resultset('CachedPathInputs')->search(
|
|
||||||
{srcpath => $uri, sha256hash => $sha256});
|
|
||||||
|
|
||||||
# Path inputs don't have a natural notion of a "revision",
|
|
||||||
# so we simulate it by using the timestamp that we first
|
|
||||||
# saw this path have this SHA-256 hash. So if the
|
|
||||||
# contents of the path changes, we get a new "revision",
|
|
||||||
# but if it doesn't change (or changes back), we don't get
|
|
||||||
# a new "revision".
|
|
||||||
if (!defined $cachedInput) {
|
|
||||||
txn_do($db, sub {
|
|
||||||
$db->resultset('CachedPathInputs')->create(
|
|
||||||
{ srcpath => $uri
|
|
||||||
, timestamp => $timestamp
|
|
||||||
, lastseen => $timestamp
|
|
||||||
, sha256hash => $sha256
|
|
||||||
, storepath => $storePath
|
|
||||||
});
|
|
||||||
});
|
|
||||||
} else {
|
|
||||||
$timestamp = $cachedInput->timestamp;
|
|
||||||
txn_do($db, sub {
|
|
||||||
$cachedInput->update({lastseen => time});
|
|
||||||
});
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
}
|
||||||
|
|
||||||
return
|
return
|
||||||
{ type => $type
|
{ type => $type
|
||||||
, uri => $uri
|
, uri => $uri
|
||||||
, storePath => $storePath
|
, storePath => $storePath
|
||||||
, sha256hash => $sha256
|
, sha256hash => $sha256
|
||||||
, revision => strftime "%Y%m%d%H%M%S", gmtime($timestamp)
|
, revision => strftime "%Y%m%d%H%M%S", gmtime($timestamp)
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
sub fetchInputSVN {
|
sub fetchInputSVN {
|
||||||
my ($db, $project, $jobset, $name, $type, $value) = @_;
|
my ($db, $project, $jobset, $name, $type, $value) = @_;
|
||||||
|
|
||||||
my $uri = $value;
|
my $uri = $value;
|
||||||
|
|
||||||
my $sha256;
|
my $sha256;
|
||||||
my $storePath;
|
my $storePath;
|
||||||
|
|
||||||
# First figure out the last-modified revision of the URI.
|
# First figure out the last-modified revision of the URI.
|
||||||
my @cmd = (["svn", "ls", "-v", "--depth", "empty", $uri],
|
my @cmd = (["svn", "ls", "-v", "--depth", "empty", $uri],
|
||||||
"|", ["sed", 's/^ *\([0-9]*\).*/\1/']);
|
"|", ["sed", 's/^ *\([0-9]*\).*/\1/']);
|
||||||
my $stdout; my $stderr;
|
my $stdout; my $stderr;
|
||||||
die "Cannot get head revision of Subversion repository at `$uri':\n$stderr"
|
die "Cannot get head revision of Subversion repository at `$uri':\n$stderr"
|
||||||
unless IPC::Run::run(@cmd, \$stdout, \$stderr);
|
unless IPC::Run::run(@cmd, \$stdout, \$stderr);
|
||||||
my $revision = $stdout; chomp $revision;
|
my $revision = $stdout; chomp $revision;
|
||||||
die unless $revision =~ /^\d+$/;
|
die unless $revision =~ /^\d+$/;
|
||||||
|
|
||||||
(my $cachedInput) = $db->resultset('CachedSubversionInputs')->search(
|
(my $cachedInput) = $db->resultset('CachedSubversionInputs')->search(
|
||||||
{uri => $uri, revision => $revision});
|
{uri => $uri, revision => $revision});
|
||||||
|
|
||||||
if (defined $cachedInput && isValidPath($cachedInput->storepath)) {
|
if (defined $cachedInput && isValidPath($cachedInput->storepath)) {
|
||||||
$storePath = $cachedInput->storepath;
|
$storePath = $cachedInput->storepath;
|
||||||
$sha256 = $cachedInput->sha256hash;
|
$sha256 = $cachedInput->sha256hash;
|
||||||
} else {
|
} else {
|
||||||
|
|
||||||
# Then download this revision into the store.
|
# Then download this revision into the store.
|
||||||
print STDERR "checking out Subversion input ", $name, " from $uri revision $revision\n";
|
print STDERR "checking out Subversion input ", $name, " from $uri revision $revision\n";
|
||||||
$ENV{"NIX_HASH_ALGO"} = "sha256";
|
$ENV{"NIX_HASH_ALGO"} = "sha256";
|
||||||
$ENV{"PRINT_PATH"} = "1";
|
$ENV{"PRINT_PATH"} = "1";
|
||||||
(my $res, $stdout, $stderr) = captureStdoutStderr(
|
(my $res, $stdout, $stderr) = captureStdoutStderr(
|
||||||
"nix-prefetch-svn", $uri, $revision);
|
"nix-prefetch-svn", $uri, $revision);
|
||||||
die "Cannot check out Subversion repository `$uri':\n$stderr" unless $res;
|
die "Cannot check out Subversion repository `$uri':\n$stderr" unless $res;
|
||||||
|
|
||||||
($sha256, $storePath) = split ' ', $stdout;
|
($sha256, $storePath) = split ' ', $stdout;
|
||||||
|
|
||||||
txn_do($db, sub {
|
txn_do($db, sub {
|
||||||
$db->resultset('CachedSubversionInputs')->create(
|
$db->resultset('CachedSubversionInputs')->create(
|
||||||
{ uri => $uri
|
{ uri => $uri
|
||||||
, revision => $revision
|
, revision => $revision
|
||||||
, sha256hash => $sha256
|
, sha256hash => $sha256
|
||||||
, storepath => $storePath
|
, storepath => $storePath
|
||||||
});
|
});
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
return
|
return
|
||||||
{ type => $type
|
{ type => $type
|
||||||
, uri => $uri
|
, uri => $uri
|
||||||
, storePath => $storePath
|
, storePath => $storePath
|
||||||
, sha256hash => $sha256
|
, sha256hash => $sha256
|
||||||
, revision => $revision
|
, revision => $revision
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
sub fetchInputBuild {
|
sub fetchInputBuild {
|
||||||
my ($db, $project, $jobset, $name, $type, $value) = @_;
|
my ($db, $project, $jobset, $name, $type, $value) = @_;
|
||||||
|
|
||||||
my ($projectName, $jobsetName, $jobName, $attrs) = parseJobName($value);
|
my ($projectName, $jobsetName, $jobName, $attrs) = parseJobName($value);
|
||||||
$projectName ||= $project->name;
|
$projectName ||= $project->name;
|
||||||
$jobsetName ||= $jobset->name;
|
$jobsetName ||= $jobset->name;
|
||||||
|
|
||||||
# Pick the most recent successful build of the specified job.
|
# Pick the most recent successful build of the specified job.
|
||||||
(my $prevBuild) = $db->resultset('Builds')->search(
|
(my $prevBuild) = $db->resultset('Builds')->search(
|
||||||
{ finished => 1, project => $projectName, jobset => $jobsetName
|
{ finished => 1, project => $projectName, jobset => $jobsetName
|
||||||
, job => $jobName, buildStatus => 0 },
|
, job => $jobName, buildStatus => 0 },
|
||||||
{ join => 'resultInfo', order_by => "me.id DESC", rows => 1
|
{ join => 'resultInfo', order_by => "me.id DESC", rows => 1
|
||||||
, where => \ attrsToSQL($attrs, "me.id") });
|
, where => \ attrsToSQL($attrs, "me.id") });
|
||||||
|
|
||||||
if (!defined $prevBuild || !isValidPath($prevBuild->outpath)) {
|
if (!defined $prevBuild || !isValidPath($prevBuild->outpath)) {
|
||||||
print STDERR "input `", $name, "': no previous build available\n";
|
print STDERR "input `", $name, "': no previous build available\n";
|
||||||
return undef;
|
return undef;
|
||||||
}
|
}
|
||||||
|
|
||||||
#print STDERR "input `", $name, "': using build ", $prevBuild->id, "\n";
|
#print STDERR "input `", $name, "': using build ", $prevBuild->id, "\n";
|
||||||
|
|
||||||
my $pkgNameRE = "(?:(?:[A-Za-z0-9]|(?:-[^0-9]))+)";
|
my $pkgNameRE = "(?:(?:[A-Za-z0-9]|(?:-[^0-9]))+)";
|
||||||
my $versionRE = "(?:[A-Za-z0-9\.\-]+)";
|
my $versionRE = "(?:[A-Za-z0-9\.\-]+)";
|
||||||
|
|
||||||
my $relName = ($prevBuild->resultInfo->releasename or $prevBuild->nixname);
|
my $relName = ($prevBuild->resultInfo->releasename or $prevBuild->nixname);
|
||||||
my $version = $2 if $relName =~ /^($pkgNameRE)-($versionRE)$/;
|
my $version = $2 if $relName =~ /^($pkgNameRE)-($versionRE)$/;
|
||||||
|
|
||||||
return
|
return
|
||||||
{ type => "build"
|
{ type => "build"
|
||||||
, storePath => $prevBuild->outpath
|
, storePath => $prevBuild->outpath
|
||||||
, id => $prevBuild->id
|
, id => $prevBuild->id
|
||||||
, version => $version
|
, version => $version
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
sub fetchInputSystemBuild {
|
sub fetchInputSystemBuild {
|
||||||
my ($db, $project, $jobset, $name, $type, $value) = @_;
|
my ($db, $project, $jobset, $name, $type, $value) = @_;
|
||||||
|
|
||||||
my ($projectName, $jobsetName, $jobName, $attrs) = parseJobName($value);
|
my ($projectName, $jobsetName, $jobName, $attrs) = parseJobName($value);
|
||||||
$projectName ||= $project->name;
|
$projectName ||= $project->name;
|
||||||
$jobsetName ||= $jobset->name;
|
$jobsetName ||= $jobset->name;
|
||||||
|
|
||||||
my @latestBuilds = $db->resultset('LatestSucceededForJob')
|
my @latestBuilds = $db->resultset('LatestSucceededForJob')
|
||||||
->search({}, {bind => [$projectName, $jobsetName, $jobName]});
|
->search({}, {bind => [$projectName, $jobsetName, $jobName]});
|
||||||
|
|
||||||
my @validBuilds = ();
|
my @validBuilds = ();
|
||||||
foreach my $build (@latestBuilds) {
|
foreach my $build (@latestBuilds) {
|
||||||
if(isValidPath($build->outpath)) {
|
push(@validBuilds, $build) if isValidPath($build->outpath);
|
||||||
push(@validBuilds,$build);
|
}
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
if (scalar(@validBuilds) == 0) {
|
if (scalar(@validBuilds) == 0) {
|
||||||
print STDERR "input `", $name, "': no previous build available\n";
|
print STDERR "input `", $name, "': no previous build available\n";
|
||||||
return undef;
|
return undef;
|
||||||
}
|
}
|
||||||
|
|
||||||
my @inputs = ();
|
my @inputs = ();
|
||||||
foreach my $prevBuild (@validBuilds) {
|
|
||||||
my $pkgNameRE = "(?:(?:[A-Za-z0-9]|(?:-[^0-9]))+)";
|
foreach my $prevBuild (@validBuilds) {
|
||||||
my $versionRE = "(?:[A-Za-z0-9\.\-]+)";
|
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 $relName = ($prevBuild->resultInfo->releasename or $prevBuild->nixname);
|
||||||
|
my $version = $2 if $relName =~ /^($pkgNameRE)-($versionRE)$/;
|
||||||
my $input =
|
|
||||||
{ type => "sysbuild"
|
my $input =
|
||||||
, storePath => $prevBuild->outpath
|
{ type => "sysbuild"
|
||||||
, id => $prevBuild->id
|
, storePath => $prevBuild->outpath
|
||||||
, version => $version
|
, id => $prevBuild->id
|
||||||
, system => $prevBuild->system
|
, version => $version
|
||||||
};
|
, system => $prevBuild->system
|
||||||
push(@inputs, $input);
|
};
|
||||||
}
|
push(@inputs, $input);
|
||||||
return @inputs;
|
}
|
||||||
|
|
||||||
|
return @inputs;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
sub fetchInputGit {
|
sub fetchInputGit {
|
||||||
my ($db, $project, $jobset, $name, $type, $value) = @_;
|
my ($db, $project, $jobset, $name, $type, $value) = @_;
|
||||||
|
|
||||||
|
|
@ -270,7 +274,7 @@ sub fetchInputGit {
|
||||||
# First figure out the last-modified revision of the URI.
|
# First figure out the last-modified revision of the URI.
|
||||||
my $stdout; my $stderr;
|
my $stdout; my $stderr;
|
||||||
(my $res, $stdout, $stderr) = captureStdoutStderr(
|
(my $res, $stdout, $stderr) = captureStdoutStderr(
|
||||||
"git", "ls-remote", $uri, $branch);
|
"git", "ls-remote", $uri, $branch);
|
||||||
die "Cannot get head revision of Git branch '$branch' at `$uri':\n$stderr" unless $res;
|
die "Cannot get head revision of Git branch '$branch' at `$uri':\n$stderr" unless $res;
|
||||||
|
|
||||||
(my $revision, my $ref) = split ' ', $stdout;
|
(my $revision, my $ref) = split ' ', $stdout;
|
||||||
|
|
@ -279,98 +283,99 @@ sub fetchInputGit {
|
||||||
# Some simple caching: don't check a uri/branch more than once every hour, but prefer exact match on uri/branch/revision.
|
# Some simple caching: don't check a uri/branch more than once every hour, but prefer exact match on uri/branch/revision.
|
||||||
my $cachedInput ;
|
my $cachedInput ;
|
||||||
($cachedInput) = $db->resultset('CachedGitInputs')->search(
|
($cachedInput) = $db->resultset('CachedGitInputs')->search(
|
||||||
{uri => $uri, branch => $branch, revision => $revision},
|
{uri => $uri, branch => $branch, revision => $revision},
|
||||||
{rows => 1});
|
{rows => 1});
|
||||||
if (! defined $cachedInput ) {
|
if (! defined $cachedInput ) {
|
||||||
($cachedInput) = $db->resultset('CachedGitInputs')->search(
|
($cachedInput) = $db->resultset('CachedGitInputs')->search(
|
||||||
{uri => $uri, branch => $branch, lastseen => {">", $timestamp - 3600}},
|
{uri => $uri, branch => $branch, lastseen => {">", $timestamp - 3600}},
|
||||||
{rows => 1, order_by => "lastseen DESC"});
|
{rows => 1, order_by => "lastseen DESC"});
|
||||||
}
|
}
|
||||||
|
|
||||||
if (defined $cachedInput && isValidPath($cachedInput->storepath)) {
|
if (defined $cachedInput && isValidPath($cachedInput->storepath)) {
|
||||||
$storePath = $cachedInput->storepath;
|
$storePath = $cachedInput->storepath;
|
||||||
$sha256 = $cachedInput->sha256hash;
|
$sha256 = $cachedInput->sha256hash;
|
||||||
$timestamp = $cachedInput->timestamp;
|
$timestamp = $cachedInput->timestamp;
|
||||||
$revision = $cachedInput->revision;
|
$revision = $cachedInput->revision;
|
||||||
} else {
|
} else {
|
||||||
|
|
||||||
# Then download this revision into the store.
|
# Then download this revision into the store.
|
||||||
print STDERR "checking out Git input from $uri";
|
print STDERR "checking out Git input from $uri";
|
||||||
$ENV{"NIX_HASH_ALGO"} = "sha256";
|
$ENV{"NIX_HASH_ALGO"} = "sha256";
|
||||||
$ENV{"PRINT_PATH"} = "1";
|
$ENV{"PRINT_PATH"} = "1";
|
||||||
|
|
||||||
# Checked out code often wants to be able to run `git
|
# Checked out code often wants to be able to run `git
|
||||||
# describe', e.g., code that uses Gnulib's `git-version-gen'
|
# describe', e.g., code that uses Gnulib's `git-version-gen'
|
||||||
# script. Thus, we leave `.git' in there. Same for
|
# script. Thus, we leave `.git' in there. Same for
|
||||||
# Subversion (e.g., libgcrypt's build system uses that.)
|
# Subversion (e.g., libgcrypt's build system uses that.)
|
||||||
$ENV{"NIX_PREFETCH_GIT_LEAVE_DOT_GIT"} = "1";
|
$ENV{"NIX_PREFETCH_GIT_LEAVE_DOT_GIT"} = "1";
|
||||||
$ENV{"NIX_PREFETCH_SVN_LEAVE_DOT_SVN"} = "1";
|
$ENV{"NIX_PREFETCH_SVN_LEAVE_DOT_SVN"} = "1";
|
||||||
|
|
||||||
# Ask for a "deep clone" to allow "git describe" and similar
|
# Ask for a "deep clone" to allow "git describe" and similar
|
||||||
# tools to work. See
|
# tools to work. See
|
||||||
# http://thread.gmane.org/gmane.linux.distributions.nixos/3569
|
# http://thread.gmane.org/gmane.linux.distributions.nixos/3569
|
||||||
# for a discussion.
|
# for a discussion.
|
||||||
$ENV{"NIX_PREFETCH_GIT_DEEP_CLONE"} = "1";
|
$ENV{"NIX_PREFETCH_GIT_DEEP_CLONE"} = "1";
|
||||||
|
|
||||||
(my $res, $stdout, $stderr) = captureStdoutStderr(
|
(my $res, $stdout, $stderr) = captureStdoutStderr(
|
||||||
"nix-prefetch-git", $uri, $revision);
|
"nix-prefetch-git", $uri, $revision);
|
||||||
die "Cannot check out Git repository branch '$branch' at `$uri':\n$stderr" unless $res;
|
die "Cannot check out Git repository branch '$branch' at `$uri':\n$stderr" unless $res;
|
||||||
|
|
||||||
($sha256, $storePath) = split ' ', $stdout;
|
($sha256, $storePath) = split ' ', $stdout;
|
||||||
($cachedInput) = $db->resultset('CachedGitInputs')->search(
|
($cachedInput) = $db->resultset('CachedGitInputs')->search(
|
||||||
{uri => $uri, branch => $branch, sha256hash => $sha256});
|
{uri => $uri, branch => $branch, sha256hash => $sha256});
|
||||||
|
|
||||||
if (!defined $cachedInput) {
|
if (!defined $cachedInput) {
|
||||||
txn_do($db, sub {
|
txn_do($db, sub {
|
||||||
$db->resultset('CachedGitInputs')->update_or_create(
|
$db->resultset('CachedGitInputs')->update_or_create(
|
||||||
{ uri => $uri
|
{ uri => $uri
|
||||||
, branch => $branch
|
, branch => $branch
|
||||||
, revision => $revision
|
, revision => $revision
|
||||||
, timestamp => $timestamp
|
, timestamp => $timestamp
|
||||||
, lastseen => $timestamp
|
, lastseen => $timestamp
|
||||||
, sha256hash => $sha256
|
, sha256hash => $sha256
|
||||||
, storepath => $storePath
|
, storepath => $storePath
|
||||||
});
|
});
|
||||||
});
|
});
|
||||||
} else {
|
} else {
|
||||||
$timestamp = $cachedInput->timestamp;
|
$timestamp = $cachedInput->timestamp;
|
||||||
txn_do($db, sub {
|
txn_do($db, sub {
|
||||||
$cachedInput->update({lastseen => time});
|
$cachedInput->update({lastseen => time});
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
return
|
return
|
||||||
{ type => $type
|
{ type => $type
|
||||||
, uri => $uri
|
, uri => $uri
|
||||||
, storePath => $storePath
|
, storePath => $storePath
|
||||||
, sha256hash => $sha256
|
, sha256hash => $sha256
|
||||||
, revision => $revision
|
, revision => $revision
|
||||||
};
|
};
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
sub fetchInputCVS {
|
sub fetchInputCVS {
|
||||||
my ($db, $project, $jobset, $name, $type, $value) = @_;
|
my ($db, $project, $jobset, $name, $type, $value) = @_;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
sub fetchInput {
|
sub fetchInput {
|
||||||
my ($db, $project, $jobset, $name, $type, $value) = @_;
|
my ($db, $project, $jobset, $name, $type, $value) = @_;
|
||||||
|
|
||||||
if ($type eq "path") {
|
if ($type eq "path") {
|
||||||
return fetchInputPath($db, $project, $jobset, $name, $type, $value);
|
return fetchInputPath($db, $project, $jobset, $name, $type, $value);
|
||||||
}
|
}
|
||||||
elsif ($type eq "svn") {
|
elsif ($type eq "svn") {
|
||||||
return fetchInputSVN($db, $project, $jobset, $name, $type, $value);
|
return fetchInputSVN($db, $project, $jobset, $name, $type, $value);
|
||||||
}
|
}
|
||||||
elsif ($type eq "build") {
|
elsif ($type eq "build") {
|
||||||
return fetchInputBuild($db, $project, $jobset, $name, $type, $value);
|
return fetchInputBuild($db, $project, $jobset, $name, $type, $value);
|
||||||
}
|
}
|
||||||
elsif ($type eq "sysbuild") {
|
elsif ($type eq "sysbuild") {
|
||||||
return fetchInputSystemBuild($db, $project, $jobset, $name, $type, $value);
|
return fetchInputSystemBuild($db, $project, $jobset, $name, $type, $value);
|
||||||
}
|
}
|
||||||
elsif ($type eq "git") {
|
elsif ($type eq "git") {
|
||||||
return fetchInputGit($db, $project, $jobset, $name, $type, $value);
|
return fetchInputGit($db, $project, $jobset, $name, $type, $value);
|
||||||
}
|
}
|
||||||
|
|
||||||
elsif ($type eq "string") {
|
elsif ($type eq "string") {
|
||||||
|
|
@ -450,16 +455,16 @@ sub evalJobs {
|
||||||
|
|
||||||
my @filteredJobs = ();
|
my @filteredJobs = ();
|
||||||
foreach my $job (@{$jobs->{job}}) {
|
foreach my $job (@{$jobs->{job}}) {
|
||||||
my $validJob = 1;
|
my $validJob = 1;
|
||||||
foreach my $arg (@{$job->{arg}}) {
|
foreach my $arg (@{$job->{arg}}) {
|
||||||
my $input = $inputInfo->{$arg->{name}}->[$arg->{altnr}] ;
|
my $input = $inputInfo->{$arg->{name}}->[$arg->{altnr}] ;
|
||||||
if($input->{type} eq "sysbuild" && ! ($input->{system} eq $job->{system}) ) {
|
if ($input->{type} eq "sysbuild" && $input->{system} ne $job->{system}) {
|
||||||
$validJob = 0 ;
|
$validJob = 0;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
if($validJob) {
|
if ($validJob) {
|
||||||
push(@filteredJobs, $job);
|
push(@filteredJobs, $job);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
$jobs->{job} = \@filteredJobs;
|
$jobs->{job} = \@filteredJobs;
|
||||||
|
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue