lix-project/hydra
3
0
Fork 6
Code Issues 2 Pull requests Packages Projects Releases Wiki Activity

CoverityScan: $b -> $build (perlcritic)

Browse source
This commit is contained in:
Graham Christensen 2021-08-20 21:50:30 -04:00
parent c929f5cac0
commit 5e10648a98
1 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
src/lib/Hydra/Plugin/CoverityScan.pm
View file

@ -12,19 +12,19 @@ sub isEnabled {
} }
sub buildFinished { sub buildFinished {
my ($self, $b, $dependents) = @_; my ($self, $build, $dependents) = @_;
my $cfg = $self->{config}->{coverityscan}; my $cfg = $self->{config}->{coverityscan};
my @config = defined $cfg ? ref $cfg eq "ARRAY" ? @$cfg : ($cfg) : (); my @config = defined $cfg ? ref $cfg eq "ARRAY" ? @$cfg : ($cfg) : ();
# Scan the job and see if it matches any of the Coverity Scan projects # Scan the job and see if it matches any of the Coverity Scan projects
my $proj; my $proj;
my $jobName = showJobName $b; my $jobName = showJobName $build;
foreach my $p (@config) { foreach my $p (@config) {
next unless $jobName =~ /^$p->{jobs}$/; next unless $jobName =~ /^$p->{jobs}$/;
# If build is cancelled or aborted, do not upload build # If build is cancelled or aborted, do not upload build
next if $b->buildstatus == 4 || $b->buildstatus == 3; next if $build->buildstatus == 4 || $build->buildstatus == 3;
# Otherwise, select this Coverity project # Otherwise, select this Coverity project
$proj = $p; last; $proj = $p; last;
@ -47,7 +47,7 @@ sub buildFinished {
unless defined $token; unless defined $token;
# Get tarball locations # Get tarball locations
my $storePath = ($b->buildoutputs)[0]->path; my $storePath = ($build->buildoutputs)[0]->path;
my $tarballs = "$storePath/tarballs"; my $tarballs = "$storePath/tarballs";
my $covTarball; my $covTarball;
@ -87,7 +87,7 @@ sub buildFinished {
unless defined $version; unless defined $version;
# Submit build # Submit build
my $jobid = $b->id; my $jobid = $build->id;
my $desc = "Hydra Coverity Build ($jobName) - $jobid:$version"; my $desc = "Hydra Coverity Build ($jobName) - $jobid:$version";
print STDERR "uploading $desc ($shortName) to Coverity Scan\n"; print STDERR "uploading $desc ($shortName) to Coverity Scan\n";