[ABS] Fix wrong submitter issue
authorhyokeun <hyokeun.jeon@samsung.com>
Thu, 2 Aug 2018 03:28:42 +0000 (12:28 +0900)
committerYonghee Han <onstudy@samsung.com>
Thu, 31 Jan 2019 01:21:23 +0000 (10:21 +0900)
Use submitter from tag rather than gerrit event.
Dashboard link on email noti.
Mail noti for all failed steps.
Handling default rootstrap.
Fix fetch rootstrap version from Tizen Studio.

Change-Id: Ibed307283f333efe18ba1d725411dff917314542

abs/job_abs_build.py
abs/job_abs_update.py
common/tizen_studio.py

index b0f0d5b..1ad0251 100755 (executable)
@@ -124,7 +124,6 @@ class MailSender(object):
         print self.email_body
         print self.email_to
 
-        FIXME:
         prepare_mail("%s.env" % os.getenv('BUILD_TAG'), \
                      self.email_title, \
                      self.email_body, \
@@ -340,6 +339,13 @@ def retrieve_project_property(src_git, tag):
         print "submitter : %s" % submitter
         return submitter
 
+    def retrieve_submitter_name(src_git, tag):
+        t_outs, st_err, st_ret = src_git._git_inout('for-each-ref', \
+                    ['--count=1', '--sort=-taggerdate', '--format=%(taggername)', 'refs/tags/%s' % tag])
+        submitter_name = t_outs.strip().rstrip()
+        print "submitter name : %s" % submitter_name
+        return submitter_name
+
     def retrieve_commit_date(src_git):
         t_outs, t_err, t_code = src_git._git_inout('log', ['--format=%ci', '-n 1'])
         commit_date = t_outs
@@ -362,6 +368,7 @@ def retrieve_project_property(src_git, tag):
 
     ret_prop['committer'] = retrieve_committer(src_git)
     ret_prop['submitter'] = retrieve_submitter(src_git, tag)
+    ret_prop['submitter_name'] = retrieve_submitter_name(src_git, tag)
     ret_prop['commit_date'] = retrieve_commit_date(src_git)
     ret_prop['submit_date'] = retrieve_submit_date(src_git, tag)
 
@@ -563,7 +570,8 @@ def post_processing(tizen_studio, src_git, prop, data, builddir, mailer, build):
     # Register local git user
     with open(os.path.join(src_git.path, '.git', 'config'), 'a') as gitconfig:
         gitconfig.write('[user]\n\tname = %s\n\temail = %s\n' \
-                        % (data.get('name'), data.get('email')))
+                        % (prop.get('submitter_name'), prop.get('submitter')))
+    #                    % (data.get('name'), data.get('email')))
     # Checkout tpk branch
     if src_git.has_branch('origin' + new_branch, remote = True):
         print 'Branch (%s) already exist' % new_branch
@@ -755,6 +763,9 @@ def start_build(fields):
         data['new_branch'] = data.get('branch') + '_tpk'
     else:
         data['new_branch'] = data.get('branch') + '_' + data.get('profile') + '_tpk'
+    #TODO: SPIN will use only _tpk postfix. Do not use profile name.
+    if data.get('gerrit_infra') == 'LOCAL':
+        data['new_branch'] = data.get('branch') + '_tpk'
     data['new_tag'] = data.get('tag').replace(data.get('branch'), data.get('new_branch'))
 
     mailer.add_title(data.get('obs_package'))
index 97c6a54..4882527 100755 (executable)
@@ -198,7 +198,7 @@ def main(new_rs, gerrit_name):
         gerrit_infra = 'LOCAL'
         gerrit_env = GerritEnv('')
 
-    profiles = os.getenv('ABS_SUPPORTED_PROFILES').split(',')
+    profiles = os.getenv('ABS_SUPPORTED_PROJECTS').split(',')
     trigger_arg = ''
 
     kvm_root = '/'.join(os.getenv('ABS_VM_IMAGE').split('/')[:-1])
@@ -213,7 +213,7 @@ def main(new_rs, gerrit_name):
 
     profiles_to_update = []
 
-    for x in os.getenv('ABS_SUPPORTED_PROFILES').split(','):
+    for x in os.getenv('ABS_SUPPORTED_PROJECTS').split(','):
         expr = '(%s)_(\d{8}).([0-9]+)' % (x.lower().replace(':', '-'))
         if re.search(expr, new_rs):
             profiles_to_update = [x]
index c2a1020..f0e8811 100644 (file)
@@ -179,7 +179,8 @@ class TizenStudio(object):
         # Get installed rootstrap version
         built_version = None
         with open(os.path.join(self.builddir, 'rsver')) as rsverfile:
-            _built_version = rsverfile.read().replace(' ', ', ').replace('\n', ' ').encode('utf8').split(',')[0]
+            rrrr = rsverfile.read()
+            _built_version = rrrr.replace(' ', ', ').replace('\n', ' ').encode('utf8').split(',')[0]
             verregex = re.compile(r'(\d{8}_\d{1,2})')
             versearch = verregex.search(_built_version)
             if versearch is not None: