Fix the path and spec

Change-Id: I6442e4ee2046f55e20defb0abe630622b0abe2d0
Signed-off-by: Taejin Woo <tt.woo@samsung.com>

diff --git a/dtr/job_dtr_db_write.py b/dtr/job_dtr_db_writer.py
similarity index 91%
rename from dtr/job_dtr_db_write.py
rename to dtr/job_dtr_db_writer.py
index 2524b8b..cb59701 100644 (file)
--- a/dtr/job_dtr_db_write.py
+++ b/dtr/job_dtr_db_writer.py
@@ -23,10 +23,12 @@ import os
 import json
 import pprint
 
-from common.buildmonitor_db import do_query, get_value_from_query_data, do_many_query, connect_db, disconnect_db
+sys.path.insert(1, os.path.join(sys.path[0], '..'))
+
+from common.buildmonitor_db import do_query, get_value_from_query_data, do_many_query, connect_db, disconnect_db, get_multi_values_from_query_data
 from common.buildmonitor_extention import BuildMonitorExtention
 
-def dtr_target_lookup_insert_fun(TOTAL_INFO):
+def dtr_target_lookup_insert_fun(TOTAL_INFO, arg_name):
     connect_db()
 
     # Insert values
@@ -57,7 +59,10 @@ def dtr_target_lookup_insert_fun(TOTAL_INFO):
 
     disconnect_db()
 
-def dtr_test_comment_insert_fun(TOTAL_INFO):
+    return total_results
+
+
+def dtr_smoke_comment_insert_fun(TOTAL_INFO, arg_name):
     connect_db()
 
     # Insert values
@@ -86,6 +91,8 @@ def dtr_test_comment_insert_fun(TOTAL_INFO):
 
     disconnect_db()
 
+    return total_results
+
 
 def dtr_smoke_result_insert_fun(TOTAL_INFO, LOOKUP_INFO, SMOKE_CASE_INFO, arg_name):
     connect_db()
@@ -114,15 +121,17 @@ def dtr_smoke_result_insert_fun(TOTAL_INFO, LOOKUP_INFO, SMOKE_CASE_INFO, arg_na
     for case_idx, test_case_value in enumerate(total_results['test_case']): #22
         tmp_value = total_results['smoke_result_list'][case_idx]
         for value_idx, result_value in enumerate(tmp_value): #15
-            total_results[arg_name].append((result_value, test_case_value, \
-                     int(SMOKE_CASE_INFO['DB_smoke_comment_table'][case_idx][0]), \
-                     int(LOOKUP_INFO['DB_lookup_table'][value_idx][0])))
+            total_results[arg_name].append((result_value, test_case_value, int(SMOKE_CASE_INFO['DB_smoke_comment_table'][case_idx][0]), int(LOOKUP_INFO['DB_lookup_table'][value_idx][0])))
 
-    query = "INSERT INTO dtr_smoke_envorin_result (result, test_case, smoke_comment_id , target_lookup_id) VALUES(%s, %s, %s, %s)"
 
+#    pprint.pprint(total_results[arg_name])
+
+    query = "INSERT INTO dtr_smoke_envorin_result (result, test_case, smoke_comment_id , target_lookup_id) VALUES(%s, %s, %s, %s)"
     query_var_list = []
-    for smoke_DB_values in total_results[arg_name]:
-        query_var_list.append( smoke_DB_values )
+
+
+    for sample_DB_values in total_results[arg_name]:
+        query_var_list.append( sample_DB_values )
 
     pprint.pprint(query_var_list)
     do_many_query(query, query_var_list)

diff --git a/dtr/job_dtr_status.py b/dtr/job_dtr_status.py
index 2ca4c0b..dfb2543 100644 (file)
--- a/dtr/job_dtr_status.py
+++ b/dtr/job_dtr_status.py
@@ -29,6 +29,8 @@ import requests
 import pprint
 import xlrd
 
+sys.path.insert(1, os.path.join(sys.path[0], '..'))
+
 import job_dtr_db_writer
 import datetime
 

diff --git a/packaging/jenkins-scripts.spec b/packaging/jenkins-scripts.spec
index c8be41a..e009a79 100755 (executable)
--- a/packaging/jenkins-scripts.spec
+++ b/packaging/jenkins-scripts.spec
@@ -389,6 +389,6 @@ fi
 %defattr(-,jenkins,jenkins)
 %dir %{destdir}/dtr
 %{destdir}/dtr/job_dtr_status.py
-%{destdir}/dtr/job_dtr_db_write.py
+%{destdir}/dtr/job_dtr_db_writer.py
 
 %changelog