Fix abs dashboard issue

Change-Id: I354993550e22c095c3d38e3307b0a145fa950586

diff --git a/abs/job_abs_build.py b/abs/job_abs_build.py
index 6f369dd..05c66de 100755 (executable)
--- a/abs/job_abs_build.py
+++ b/abs/job_abs_build.py
@@ -852,12 +852,14 @@ def update_dashboard(git_tag, data, props, \
                 "tagger": props.get('submitter'), \
                 "tag_date": props.get('submit_date'), \
                 "tag_message": props.get('sr_message'), \
+                "tpk_git_tag": data['new_tag'], \
                 "status": status, \
                 "status_reason": status_reason, \
                 "tizen_studio_version": tizen_studio_version, \
                 "tizen_studio_distribution": tizen_studio_distribution, \
                 "rootstrap_version": rootstrap_version}
         print 'update_dashboard'
+        print data
         encoded_data = base64.b64encode(json.dumps(data))
         remote_jenkins_build_job(os.getenv('PUBLIC_JENKINS_URL'), \
                                  os.getenv('PUBLIC_JENKINS_USER'), \

diff --git a/abs/job_update_abs_rbs_status_for_dashboard.py b/abs/job_update_abs_rbs_status_for_dashboard.py
index 7cc1e4e..2820e85 100644 (file)
--- a/abs/job_update_abs_rbs_status_for_dashboard.py
+++ b/abs/job_update_abs_rbs_status_for_dashboard.py
@@ -50,7 +50,9 @@ reload(sys)
 sys.setdefaultencoding('utf-8') # pylint: disable-msg=E1101
 
 def parse_input_parameters(param):
-    return unicode_to_str(json.loads(base64.b64decode(param)))
+    _ret = unicode_to_str(json.loads(base64.b64decode(param)))
+    print _ret
+    return _ret
 
 def update_tizen_studio(param):
 
@@ -103,7 +105,6 @@ def update_commit(git_path_id, commit_id, commit_date, committer, commit_message
     buildmonitor_db.do_query(query, ('%d' % git_path_id, commit_id, committer, commit_date, commit_message, '%d' % git_path_id, commit_id))
 
 def update_tag(git_commit_id, tag_name, tag_revision, tagger, tag_date, tag_message):
-    buildmonitor_db.do_query(query, ('%d' % git_commit_id, tag_name, tag_revision, tagger, tag_date, tag_message))
     query = "INSERT INTO git_tag (git_commit_id, tag_name, tag_revision, tagger, tag_date, tag_message) \
              SELECT * FROM (SELECT %s, %s, %s, %s, %s, %s) AS tmp \
              WHERE NOT EXISTS (SELECT git_commit_id, tag_revision \