From febb293aa48ad2edc34941afecb30221cd9737b0 Mon Sep 17 00:00:00 2001 From: hyokeun Date: Mon, 2 Jul 2018 17:31:39 +0900 Subject: [PATCH] ABS: Update PMB status Change-Id: I9a5e0ccf799cbfe56636ff115e00419c51662600 --- abs/job_abs_build.py | 3 +++ abs/job_abs_update.py | 11 +++++++++-- abs/job_update_abs_rbs_status_for_dashboard.py | 2 +- common/tizen_studio.py | 8 ++++++-- 4 files changed, 19 insertions(+), 5 deletions(-) diff --git a/abs/job_abs_build.py b/abs/job_abs_build.py index 6417fd5..b747c15 100755 --- a/abs/job_abs_build.py +++ b/abs/job_abs_build.py @@ -815,6 +815,9 @@ def start_build(fields): ts_distribution = _br.get('tizen_studio_distribution') print 'VM returned [%s] [%s] [%s] [%s] [%s]\n' % (rs_ver, fail_title, fail_log, ts_version, ts_distribution) + if rs_ver is None and data.get('buildcheck', None) is not None: + rs_ver = data.get('buildcheck').split('_')[-1] + print 'Force to set RS version: %s' % rs_ver mailer.add_message('SDK Rootstrap Version: %s' % rs_ver) if my_tizen_studio.build_result != 0 and fail_title != None: diff --git a/abs/job_abs_update.py b/abs/job_abs_update.py index 31aaa78..97c6a54 100755 --- a/abs/job_abs_update.py +++ b/abs/job_abs_update.py @@ -147,8 +147,14 @@ def build_result_report(build_number): mymail.add_message('Full build cause: %s\n' % reason) mymail.add_message('OBS Target Project: %s\n' % target) mymail.add_message('branch: %s\n\n' % branch) + + if os.getenv('GERRIT_INFRA').startswith('public_gerrit'): + dashboard_url = os.getenv("PUBLIC_DASHBOARD_URL") + else: + dashboard_url = os.getenv("DASHBOARD_URL") + mymail.add_message('\nFor detailed info, please visit %s/abs_rbs.code?rbs_only=1&project=%s\n\n' \ - % (os.getenv("PUBLIC_DASHBOARD_URL"), target)) + % (dashboard_url, target)) log_size = 0 for x in build_result: @@ -252,7 +258,8 @@ def main(new_rs, gerrit_name): % (int(os.getenv('BUILD_NUMBER')), index, trigger_data['source']['package']), \ trigger_data) - trigger_next('ABS_BUILD_RESULT', {'Empty': 'Blank'}, extra_params={'BUILD_RESULT_REPORT': os.getenv('BUILD_NUMBER')}) + trigger_next('ABS_BUILD_RESULT', {'Empty': 'Blank'}, \ + extra_params={'GERRIT_INFRA': gerrit_name, 'BUILD_RESULT_REPORT': os.getenv('BUILD_NUMBER')}) if __name__ == '__main__': diff --git a/abs/job_update_abs_rbs_status_for_dashboard.py b/abs/job_update_abs_rbs_status_for_dashboard.py index c6b9241..86aeded 100644 --- a/abs/job_update_abs_rbs_status_for_dashboard.py +++ b/abs/job_update_abs_rbs_status_for_dashboard.py @@ -226,7 +226,7 @@ def update_abs_status(bm_ext, mode, main_project, status, status_reason, source_ myparam = {'project': main_project, 'rootstrap_version': rootstrap_version, 'status': 'succeeded'} - update_rootstrap_status(json.dumps(myparam)) + update_rootstrap_status(bm_ext, json.dumps(myparam)) rootstrap_id = buildmonitor_db.get_value_from_query_data(query, (main_project, rootstrap_version)) assert rootstrap_id != 0 diff --git a/common/tizen_studio.py b/common/tizen_studio.py index 25634c7..c2a1020 100644 --- a/common/tizen_studio.py +++ b/common/tizen_studio.py @@ -179,8 +179,12 @@ 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') - built_version = built_version.split('.')[-1] + _built_version = rsverfile.read().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: + if versearch.group() is not None: + built_version = versearch.group() print 'Installed RS version... %s' % built_version if built_version is None: print 'Not able detect installed Rootstrap version' -- 2.7.4