From f0455cadbc604470e504c35867131753c26db339 Mon Sep 17 00:00:00 2001 From: Junghyun Kim Date: Wed, 12 Jul 2017 17:00:58 +0900 Subject: [PATCH] assign right build_project_id PROBLEM: - right build_project_id should be set for right info_stage data. SOLUTION: - Use snapshot name to get build_project_id Change-Id: Ie720a5433105f23d2f1bd8d791e7c355f4cd0df4 Signed-off-by: Junghyun Kim --- job_trbs_test_result_receiver.py | 17 +++++++++++++---- 1 file changed, 13 insertions(+), 4 deletions(-) diff --git a/job_trbs_test_result_receiver.py b/job_trbs_test_result_receiver.py index f170ab1..77556a5 100755 --- a/job_trbs_test_result_receiver.py +++ b/job_trbs_test_result_receiver.py @@ -34,17 +34,25 @@ def check_test_failure(data, is_ref_exist, is_perf_exist): return 1 -def insert_test_stage(data, MYSQL, sr_id, is_ref_exist, is_perf_exist ): +def insert_test_stage(data, MYSQL, sr_id, snapshot, is_ref_exist, is_perf_exist ): status = 'F'; if check_test_failure(data, is_ref_exist, is_perf_exist): status = 'S'; + build_project_id = 0 + sql_data = (snapshot,) + sql = "SELECT build_project_id FROM build_snapshot WHERE snapshot_name=%s LIMIT 1" + MYSQL['cursor'].execute(sql, sql_data) + row = MYSQL['cursor'].fetchall() + if len(row) > 0: + build_project_id = row[0]['build_project_id'] + cur_time = datetime.datetime.now() - sql_data = (sr_id, cur_time, cur_time, status, status) + sql_data = (sr_id, cur_time, cur_time, status, build_project_id, status) sql = "INSERT INTO sr_stage (sr_status_id, info_stage_id, "\ " stage_start_time, stage_end_time, stage_status, build_project_id)"\ - " VALUES (%s, 101, %s, %s, %s, 0) ON DUPLICATE KEY UPDATE stage_status=%s" + " VALUES (%s, 101, %s, %s, %s, %s) ON DUPLICATE KEY UPDATE stage_status=%s" pprint.pprint(sql) pprint.pprint(sql_data) MYSQL['cursor'].execute(sql, sql_data) @@ -801,6 +809,7 @@ if __name__ == "__main__": print "[ERROR] MYSQL : %s (%s)" % (str(e), sql) - insert_test_stage(CONFIG['RAW'], MYSQL, DINFO['sr_status_id'] , isExistRef , isExistPerf) + snapshot = CONFIG['RAW']['TCT']['environment']['build_id'] + insert_test_stage(CONFIG['RAW'], MYSQL, DINFO['sr_status_id'], snapshot, isExistRef , isExistPerf) exit(0) -- 2.7.4