jpp/ansible-roles
1
0
Fork 0
mirror of https://git.lapiole.org/dani/ansible-roles.git synced 2025-04-16 10:13:26 +02:00
Code Issues Packages Projects Releases Wiki Activity

Update to 2022-02-11 18:00

Browse Source
This commit is contained in:
Daniel Berteaud 2022-02-11 18:00:17 +01:00
parent 302293ec6d
commit 1689aa1152
1 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
roles/rpm_build_server/files/watcher.pl
View File

@ -152,13 +152,13 @@ sub handle_submit {
make_path($result); make_path($result);
my $mock_msg; my $mock_msg;
foreach my $out (qx(mock -r $target-$arch --resultdir=$result $srpm 2>&1)){ foreach my $out (qx(mock -r $target-$arch --resultdir=$result $srpm 2>&1)){
chomp $out;
$mock_msg .= $out; $mock_msg .= $out;
chomp $out;
log_info("[$job_id] $out"); log_info("[$job_id] $out");
} }
if ($? != 0) { if ($? != 0) {
log_info("[$job_id] Build submited by $submiter failed"); log_info("[$job_id] Build submited by $submiter failed");
handle_error($job_id, 'Mock build', $mock_msg); handle_error($job_id, 'Mock build', $mock_msg, $email);
return; return;
} }
my $repo_dir = $conf->{paths}->{repo}; my $repo_dir = $conf->{paths}->{repo};
@ -179,7 +179,7 @@ sub handle_submit {
qx(rpm --addsign $built_pkg); qx(rpm --addsign $built_pkg);
if ($? != 0) { if ($? != 0) {
log_info("[$job_id] Signing failed"); log_info("[$job_id] Signing failed");
handle_error($job_id, 'Package signature error', "Command rpm --addsign $built_pkg failed"); handle_error($job_id, 'Package signature error', "Command rpm --addsign $built_pkg failed", $email);
return; return;
} }
# Open the package without checking the signature, as the key might not be present in the # Open the package without checking the signature, as the key might not be present in the
@ -207,7 +207,8 @@ sub handle_submit {
handle_error( handle_error(
$job_id, $job_id,
'Createrepo error', 'Createrepo error',
"Command createrepo --checksum sha -x \"*debuginfo*\" --update -c $repo_cache_dir $repo_dir" "Command createrepo --checksum sha -x \"*debuginfo*\" --update -c $repo_cache_dir $repo_dir",
$email
); );
return; return;
} }
@ -230,7 +231,7 @@ sub handle_submit {
} }
if ($? != 0) { if ($? != 0) {
log_info("[$job_id] Syncing to $mirror->{dest} failed"); log_info("[$job_id] Syncing to $mirror->{dest} failed");
handle_error($job_id, 'Mirror update error', "Command $rsync_cmd failed"); handle_error($job_id, 'Mirror update error', "Command $rsync_cmd failed", $email);
return; return;
} }
} }