Merge pull request #9011 from mlschroe/master

[backend] add support for buildflags:obsgendiff for diff generation
openSUSE · Jan 30, 2020 · 6717f19 · 6717f19
2 parents 4c45dc1 + 8e2e74c
commit 6717f19
Show file tree

Hide file tree

Showing 5 changed files with 47 additions and 0 deletions.
diff --git a/src/backend/BSSched/BuildJob.pm b/src/backend/BSSched/BuildJob.pm
@@ -1167,6 +1167,9 @@ sub create {
     my $genbuildreqs = ($ctx->{'genbuildreqs'} || {})->{$packid};
     $binfo->{'logidlelimit'} = $bconf->{'buildflags:logidlelimit'} if $bconf->{'buildflags:logidlelimit'};
     $binfo->{'genbuildreqs'} = $genbuildreqs->[0] if $genbuildreqs;
+    if ($bconf->{'buildflags:obsgendiff'} && @{$ctx->{'repo'}->{'releasetarget'} || []}) {
+      $binfo->{'obsgendiff'} = $ctx->{'repo'}->{'releasetarget'}->[0];
+    }
   }
   $ctx->writejob($job, $binfo, $reason);
 

diff --git a/src/backend/BSXML.pm b/src/backend/BSXML.pm
@@ -546,6 +546,10 @@ our $buildinfo = [
 	'logidlelimit',	# internal
 	'logsizelimit',	# internal
 	'genbuildreqs',	# internal
+      [ 'obsgendiff' =>
+	    'project',
+	    'package',
+      ],		# internal
       [ 'dep' ],
      [[ 'bdep' =>
 	'name',

diff --git a/src/backend/bs_repserver b/src/backend/bs_repserver
@@ -1780,6 +1780,17 @@ sub getpreinstallimageinfos {
   return ($answer, 'Content-Type: application/octet-stream');
 }
 
+sub getobsgendiffdata {
+  my ($cgi, $projid, $repoid, $arch) = @_;
+  my $dir = "$reporoot/$projid/$repoid/$arch/:repo";
+  my @files;
+  for my $f (grep {/[^\.].*\.obsgendiff$/} sort(ls($dir))) {
+    push @files, {'name' => $f, 'filename' => "$dir/$f"};
+  }
+  BSWatcher::reply_cpio(\@files);
+  return undef;
+}
+
 sub dirty {
   my ($projid, $repoid, $arch) = @_;
 
@@ -4323,6 +4334,7 @@ my $dispatches = [
   '!worker /getpackagebinaryversionlist $project $repository $arch $package* withcode:bool? workerid?' => \&getpackagebinaryversionlist,
   '!worker /badpackagebinaryversionlist $project $repository $arch $package* workerid?' => \&badpackagebinaryversionlist,
   '!worker /getpreinstallimageinfos $prpa+ match:? workerid?' => \&getpreinstallimageinfos,
+  '/getobsgendiffdata $project $repository $arch workerid?' => \&getobsgendiffdata,
 
   # published files
   '/published' => \&publisheddir,

diff --git a/src/backend/bs_srcserver b/src/backend/bs_srcserver
@@ -5403,6 +5403,19 @@ sub worker_getbinaryversions {
   return ($bvl, $BSXML::binaryversionlist);
 }
 
+sub getobsgendiffdata {
+  my ($cgi, $projid, $repoid, $arch) = @_;
+  checkprojrepoarch($projid, $repoid, $arch);
+  my $reposerver = $BSConfig::partitioning ? BSSrcServer::Partition::projid2reposerver($projid) : $BSConfig::reposerver;
+  my $param = {
+    'uri' => "$reposerver/getobsgendiffdata",
+    'ignorestatus' => 1,
+    'receiver' => \&BSServer::reply_receiver,
+  };
+  BSWatcher::rpc($param, undef, BSRPC::args($cgi, 'project', 'repository', 'arch', 'workerid'));
+  return undef;
+}
+
 ####################################################################
 
 # this is shared for AJAX requests
@@ -6647,6 +6660,7 @@ my $dispatches = [
   '/getsslcert $project autoextend:bool? workerid? signtype:?' => \&getsslcert,
   '/getbinaries $project $repository $arch binaries: nometa:bool? workerid? module*' => \&worker_getbinaries,
   '/getbinaryversions $project $repository $arch binaries: nometa:bool? workerid? module*' => \&worker_getbinaryversions,
+  '/getobsgendiffdata $project $repository $arch workerid?' => \&getobsgendiffdata,
 
   # publisher/signer calls
   '/getsignkey $project withpubkey:bool? autoextend:bool? withalgo:bool?' => \&getsignkey,

diff --git a/src/backend/bs_worker b/src/backend/bs_worker
@@ -1084,6 +1084,19 @@ sub getfollowupsources {
   }, undef, "rev=$buildinfo->{'srcmd5'}");
 }
 
+sub getobsgendiffdata {
+  my ($buildinfo, $dir) = @_;
+  my $obsgendiff = $buildinfo->{'obsgendiff'};
+  return undef unless $obsgendiff;
+  my $server = $buildinfo->{'srcserver'} || $srcserver;
+  my $res = BSRPC::rpc({
+    'uri' => "$server/getobsgendiffdata",
+    'directory' => $dir,
+    'timeout' => $gettimeout,
+  }, $BSXML::dir, "project=$obsgendiff->{'project'}", "repository=$obsgendiff->{'repository'}", "arch=$buildinfo->{'arch'}", "jobid=$buildinfo->{'jobid'}");
+  return $res;
+}
+
 sub getsslcert {
   my ($buildinfo, $dir, $signtype) = @_;
   my $server = $buildinfo->{'srcserver'} || $srcserver;
@@ -3037,6 +3050,7 @@ sub dobuild {
 	close F;
       }
     }
+    getobsgendiffdata($buildinfo, $srcdir) if $buildinfo->{'obsgendiff'};
     getsslcert($buildinfo, $srcdir, $needappxsslcert ? 'appx' : undef) if $needsslcert || $needappxsslcert;
     readbuildenv($buildinfo, $srcdir);
     print "packages, ";