From c00cd066ec3a0f2c04e998d8b4a000e01711032d Mon Sep 17 00:00:00 2001 From: ZhuoX Li Date: Wed, 13 Aug 2014 18:52:53 +0800 Subject: [PATCH] Only allow 'prerelease' type into pre-workflow. If obs_stg_prj from git-obs-mapping.xml is not 'prerelease', it should not be executed prerelease workflow in job_submit.py. Fixes: #2073 Change-Id: Ide4f0aebf035bbaf77e672e88bb29dd0eada91aa --- job_submit.py | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/job_submit.py b/job_submit.py index de83609..5f9f70e 100755 --- a/job_submit.py +++ b/job_submit.py @@ -119,12 +119,17 @@ def main(build_type): # get list of target projects from git-obs-mapping obs_target_prjs = git_obs_map(os.getenv("GERRIT_PROJECT"), git_branch) build = BuildService(obs_api, obs_user, obs_passwd) - for obs_target_prj, _obs_stg_prj, _obs_pkg in obs_target_prjs: + for obs_target_prj, obs_stg_prj, _obs_pkg in obs_target_prjs: url = 'ssh://%s:%s' % (os.getenv('GERRIT_HOSTNAME'), os.getenv('GERRIT_SSHPORT')) # get package name from gerrit_project package = os.path.basename(gerrit_project) if build_type == 'prerelease': + if obs_stg_prj != 'prerelease': + print "%s is not 'prerelease' project in git-obs-mapping.xml." \ + "It has been switched to submitobs workflow." \ + "Skipping ..." % obs_stg_prj + continue if not prerelease_enabled(backenddb, obs_target_prj): print 'Skipping %s as prerelease is not enabled for it' % \ obs_target_prj -- 2.7.4