Merge pull request #13827 from adrianschroeter/setvcs

[backend] add setvcs build flag to convert scmsync tag into rpm VCS tag

src/backend/BSSched/BuildJob.pm

@@ -884,6 +884,7 @@ sub create_jobdata {
   $binfo->{'module'} = $bconf->{'modules'} if $bconf->{'modules'};
   my $obsname = $gctx->{'obsname'};
   $binfo->{'disturl'} = "obs://$obsname/$projid/$repoid/$pdata->{'srcmd5'}-$packid" if defined($obsname) && defined($packid);
+  $binfo->{'vcs'} = $pdata->{'scmsync'} if $pdata->{'scmsync'};
 
   # no release/debuginfo for patchinfo and deltarpm builds
   return $binfo if $buildtype eq 'patchinfo' || $buildtype eq 'deltarpm';

src/backend/BSXML.pm

@@ -348,6 +348,7 @@ our $projpack = [
 		'srcmd5',	# commit id
 		'versrel',
 		'verifymd5',	# tree id
+		'scmsync',
 		'originproject',
 		'revtime',
 		'constraintsmd5',	# md5sum of constraints file in srcmd5
@@ -556,6 +557,7 @@ our $buildinfo = [
 	'srcmd5',
 	'verifymd5',
 	'rev',
+	'vcs',
 	'disturl',
 	'reason',       # just for the explain string of a build reason
 	'needed',       # number of blocked

src/backend/bs_srcserver

@@ -1416,7 +1416,7 @@ sub getprojpack {
 	$pinfo->{'error'} = 'package does not exist';
 	next;
       }
-      for (qw{build publish debuginfo useforbuild bcntsynctag sourceaccess privacy access lock releasename}) {
+      for (qw{build publish debuginfo useforbuild bcntsynctag scmsync sourceaccess privacy access lock releasename}) {
 	$pinfo->{$_} = $pack->{$_} if $pack->{$_};
       }
       if (!$pinfo->{'build'}) {

src/backend/bs_worker

@@ -3774,6 +3774,7 @@ sub dobuild {
   push @args, '--disturl', $disturl;
   push @args, '--linksources' if $localkiwi;
   push @args, '--signdummy' if ($kiwimode || '') eq 'product' && -e "$statedir/build/signdummy";
+  push @args, '--vcs', $buildinfo->{'vcs'} if $buildinfo->{'vcs'} && $bconf->{'buildflags:setvcs'};
   if ($packid =~ /(?<!^_product)(?<!^_patchinfo):./) {
     $packid =~ /^(.*):(.*?)$/;
     push @args, "--obspackage=$1" if $needobspackage;