From: Ed Bartosh <eduard.bartosh@intel.com>
Date: Tue, 25 Feb 2014 11:25:30 +0000 (+0200)
Subject: Fixed naming of accepted branches
X-Git-Tag: 1.0~188
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=2a0df0d197138297e0935ad5bb4a8816b89d2bfc;p=services%2Fjenkins-scripts.git

Fixed naming of accepted branches

Name of accepted branches were made by replacing ':' to '/' in OBS
project name. That caused conflict between branches for subprojects and
main project, e.g. Tizen:IVI and Tizen:IVI:Genivi. For this pair of
projects accepted branches were named as accepted/tizen/ivi and
accepted/tizen/ivi/genivi. This naming approach creates a conflict as
.git/refs/accepted/tizen/ivi can't be directory (for
accepted/tizen/ivi/genivi) and file (for accepted/tizen/ivi) branches at
the same time.

This issue caused failures on backend to update accepted branches.

Fixed by using '_' instead of '/' in branch names, so above 2 example
branches are named as accepted/tizen_ivi and accepted/tizen_ivi_genivi
now and do not conflict with each other.

Fixes: #1435

Change-Id: I3f253f0d438bf9b455a4fc24de151eefa1903ae5
Signed-off-by: Ed Bartosh <eduard.bartosh@intel.com>
---

diff --git a/job_request.py b/job_request.py
index 86f326a..88ec370 100755
--- a/job_request.py
+++ b/job_request.py
@@ -198,7 +198,7 @@ def request_accepted(data, gerrit, gitprj):
 
     # push accepted commit to specific hierarchy refs/heads/accepted/*
     # e.g. Tizen:Mobile should push branch refs/heads/accepted/tizen/mobile
-    dst = 'refs/heads/accepted/%s' % obs_target
+    dst = 'refs/heads/accepted/%s' % data['OBS_REQ_PRJ'].lower().replace(':', '_')
     try:
         gitprj.push(remote, data['commitid'], dst, force=True)
     except GitRepositoryError, gre: