From 192d707f62d7250899e5591edeb28ae8bd503562 Mon Sep 17 00:00:00 2001 From: hyokeun Date: Tue, 18 Jul 2017 16:03:52 +0900 Subject: [PATCH] Support OBS_use_specname for submitobs job Change-Id: If98d4adfe65f45184aaf1f5d7b327fe488723e99 --- job_submitobs.py | 37 +++++++++++++++++++++---------------- 1 file changed, 21 insertions(+), 16 deletions(-) diff --git a/job_submitobs.py b/job_submitobs.py index 30ee169..6741504 100644 --- a/job_submitobs.py +++ b/job_submitobs.py @@ -431,16 +431,26 @@ def main(): print "Project %s doesn't exist in OBS" % prj return 1 - # search specfile under packaging directory - specfile = find_specfile(prjdir, packagingdir, tag, event, tagger, \ - obs_pkg, debug_prj_name=obs_dst_prj) - if not specfile: - return 0 - - # parse specfile - spec = parse_specfile(specfile, tag, event, tagger) - if not spec: - return 0 + if 'OBS_use_specname' in target and target['OBS_use_specname'] == 'yes': + # search specfile under packaging directory + specfile = find_specfile(prjdir, packagingdir, tag, event, tagger, \ + obs_pkg, debug_prj_name=obs_dst_prj) + if not specfile: + return 0 + # parse specfile + spec = parse_specfile(specfile, tag, event, tagger) + if not spec: + return 0 + package = spec.name + print 'spec name = %s' % spec.name + else: + # get package name from xml files. + if obs_pkg: + package = obs_pkg + else: + #package name from base name of git path. + package = os.path.basename(event['project']) + print 'package name = %s' % package retry_count = 3 while retry_count > 0: @@ -458,12 +468,7 @@ def main(): url = 'ssh://%s:%s' % (os.getenv('GERRIT_HOSTNAME_EXTERNAL'), os.getenv('GERRIT_SSHPORT')) gerrit_project = os.getenv('GERRIT_PROJECT') - # get package name from xml files. - if obs_pkg: - package = obs_pkg - else: - #get package name from spec file name. - package = spec.name + # create local package print '\nCheckout %s/%s to local' % (obs_stg_prj, package) localpkg = obspkg.ObsPackage(tmpdir, obs_stg_prj, package, \ -- 2.7.4