From 2125f4d03079c613571299c5b2bca2fbeeb2970c Mon Sep 17 00:00:00 2001 From: Michael Schroeder Date: Mon, 25 Nov 2019 13:39:58 +0100 Subject: [PATCH] [backend] ptf build: take meta from source dir Also take incident number from project if it is not in the patchinfo data. --- src/backend/BSSched/BuildJob/Patchinfo.pm | 5 ++++- src/backend/bs_worker | 1 + 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/src/backend/BSSched/BuildJob/Patchinfo.pm b/src/backend/BSSched/BuildJob/Patchinfo.pm index 5436ef00f95..b3230ae95b8 100644 --- a/src/backend/BSSched/BuildJob/Patchinfo.pm +++ b/src/backend/BSSched/BuildJob/Patchinfo.pm @@ -362,7 +362,10 @@ sub build_ptf_job { return ('broken', 'no rpms') unless @rpms; # write a ptf.spec file my $patchinfo = { %{$pdata->{'patchinfo'}} }; # copy so we can modify - return ('broken', 'no incident number') unless $patchinfo->{'incident'}; + if (!$patchinfo->{'incident'}) { + return ('broken', 'no incident number') unless $ctx->{'project'} =~ /:(\d+)$/; + $patchinfo->{'incident'} = $1; + } $patchinfo->{'version'} ||= 1; $patchinfo->{'description'} =~ s/\n+$/\n/s if $patchinfo->{'description'}; my @ptfspec = split("\n", readstr("$obssrcdir/obs-ptf.spec")); diff --git a/src/backend/bs_worker b/src/backend/bs_worker index a451773a7a4..0c70ac18145 100755 --- a/src/backend/bs_worker +++ b/src/backend/bs_worker @@ -2992,6 +2992,7 @@ sub dobuild { getbinaries($buildinfo, $pkgdir, $srcdir, $preinstallimagedata); undef $oldpkgdir; $buildinfo->{'file'} = 'ptf.spec'; + @meta = split("\n", readstr("$srcdir/meta")); } elsif ($followupmode) { getfollowupsources($buildinfo, $srcdir); getsslcert($buildinfo, $srcdir);