1 |
commit: 69ec237e8a81b85e81542de529992e6214cba487 |
2 |
Author: Magnus Granberg <zorry <AT> gentoo <DOT> org> |
3 |
AuthorDate: Thu May 28 21:41:32 2015 +0000 |
4 |
Commit: Magnus Granberg <zorry <AT> gentoo <DOT> org> |
5 |
CommitDate: Thu May 28 21:41:32 2015 +0000 |
6 |
URL: https://gitweb.gentoo.org/proj/tinderbox-cluster.git/commit/?id=69ec237e |
7 |
|
8 |
rename add_tbc_logs to add_logs |
9 |
|
10 |
tbc/bin/tbc_guest_jobs | 4 ++-- |
11 |
tbc/bin/tbc_host_jobs | 6 +++--- |
12 |
tbc/pym/build_job.py | 24 ++++++++++++------------ |
13 |
tbc/pym/build_log.py | 18 +++++++++--------- |
14 |
tbc/pym/check_setup.py | 10 +++++----- |
15 |
tbc/pym/jobs.py | 28 ++++++++++++++-------------- |
16 |
tbc/pym/package.py | 44 ++++++++++++++++++++++---------------------- |
17 |
tbc/pym/sqlquerys.py | 2 +- |
18 |
tbc/pym/sync.py | 12 ++++++------ |
19 |
tbc/pym/updatedb.py | 16 ++++++++-------- |
20 |
10 files changed, 82 insertions(+), 82 deletions(-) |
21 |
|
22 |
diff --git a/tbc/bin/tbc_guest_jobs b/tbc/bin/tbc_guest_jobs |
23 |
index a6fa566..4f5716b 100755 |
24 |
--- a/tbc/bin/tbc_guest_jobs |
25 |
+++ b/tbc/bin/tbc_guest_jobs |
26 |
@@ -6,7 +6,7 @@ |
27 |
from __future__ import print_function |
28 |
from tbc.readconf import read_config_settings |
29 |
from tbc.ConnectionManager import NewConnection |
30 |
-from tbc.sqlquerys import add_tbc_logs, get_config_id, check_host_updatedb, update_deamon_status |
31 |
+from tbc.sqlquerys import add_logs, get_config_id, check_host_updatedb, update_deamon_status |
32 |
from tbc.check_setup import check_configure_guest |
33 |
from tbc.build_job import build_job_action |
34 |
from tbc.jobs import jobs_main |
35 |
@@ -24,7 +24,7 @@ def main(): |
36 |
Session = sessionmaker(bind=NewConnection(tbc_settings_dict)) |
37 |
session = Session() |
38 |
config_id = get_config_id(session, config, hostname) |
39 |
- add_tbc_logs(session, "Job and build deamon started.", "info", config_id) |
40 |
+ add_logs(session, "Job and build deamon started.", "info", config_id) |
41 |
init_build_job = build_job_action(config_id, session) |
42 |
while repeat: |
43 |
jobs_main(session, config) |
44 |
|
45 |
diff --git a/tbc/bin/tbc_host_jobs b/tbc/bin/tbc_host_jobs |
46 |
index 987b11a..21f9d31 100755 |
47 |
--- a/tbc/bin/tbc_host_jobs |
48 |
+++ b/tbc/bin/tbc_host_jobs |
49 |
@@ -8,7 +8,7 @@ from __future__ import print_function |
50 |
from tbc.readconf import get_conf_settings |
51 |
from tbc.jobs import jobs_main |
52 |
from tbc.ConnectionManager import NewConnection |
53 |
-from tbc.sqlquerys import add_tbc_logs, get_config_id |
54 |
+from tbc.sqlquerys import add_logs, get_config_id |
55 |
from sqlalchemy.orm import sessionmaker |
56 |
import time |
57 |
|
58 |
@@ -21,13 +21,13 @@ def main(): |
59 |
Session = sessionmaker(bind=NewConnection(tbc_settings_dict)) |
60 |
session = Session() |
61 |
config_id = get_config_id(session, config, hostname) |
62 |
- add_tbc_logs(session, "Job deamon started", "info", config_id) |
63 |
+ add_logs(session, "Job deamon started", "info", config_id) |
64 |
repeat = True |
65 |
while repeat: |
66 |
jobs_main(session, config_id) |
67 |
repeat = False |
68 |
time.sleep(60) |
69 |
- add_tbc_logs(session, "Job deamon stoped", "info", config_id) |
70 |
+ add_logs(session, "Job deamon stoped", "info", config_id) |
71 |
|
72 |
if __name__ == "__main__": |
73 |
main() |
74 |
\ No newline at end of file |
75 |
|
76 |
diff --git a/tbc/pym/build_job.py b/tbc/pym/build_job.py |
77 |
index dfe6639..8e3a218 100644 |
78 |
--- a/tbc/pym/build_job.py |
79 |
+++ b/tbc/pym/build_job.py |
80 |
@@ -18,7 +18,7 @@ from tbc.qacheck import check_file_in_manifest |
81 |
from tbc.main import emerge_main |
82 |
from tbc.build_log import log_fail_queru |
83 |
from tbc.actions import load_emerge_config |
84 |
-from tbc.sqlquerys import add_tbc_logs, get_packages_to_build, update_buildjobs_status, is_build_job_done |
85 |
+from tbc.sqlquerys import add_logs, get_packages_to_build, update_buildjobs_status, is_build_job_done |
86 |
|
87 |
class build_job_action(object): |
88 |
|
89 |
@@ -43,19 +43,19 @@ class build_job_action(object): |
90 |
init_flags = tbc_use_flags(settings, portdb, cpv) |
91 |
build_use_flags_list = init_flags.comper_useflags(build_dict) |
92 |
log_msg = "build_use_flags_list %s" % (build_use_flags_list,) |
93 |
- add_tbc_logs(self._session, log_msg, "info", self._config_id) |
94 |
+ add_logs(self._session, log_msg, "info", self._config_id) |
95 |
manifest_error = check_file_in_manifest(pkgdir, settings, portdb, cpv, build_use_flags_list, repo) |
96 |
if manifest_error is None: |
97 |
build_dict['check_fail'] = False |
98 |
build_cpv_dict = {} |
99 |
build_cpv_dict[cpv] = build_use_flags_list |
100 |
log_msg = "build_cpv_dict: %s" % (build_cpv_dict,) |
101 |
- add_tbc_logs(self._session, log_msg, "info", self._config_id) |
102 |
+ add_logs(self._session, log_msg, "info", self._config_id) |
103 |
return build_cpv_dict |
104 |
build_dict['type_fail'] = "Manifest error" |
105 |
build_dict['check_fail'] = True |
106 |
log_msg = "Manifest error: %s:%s" % (cpv, manifest_error) |
107 |
- add_tbc_logs(self._session, log_msg, "info", self._config_id) |
108 |
+ add_logs(self._session, log_msg, "info", self._config_id) |
109 |
else: |
110 |
build_dict['type_fail'] = "Wrong ebuild checksum" |
111 |
build_dict['check_fail'] = True |
112 |
@@ -74,13 +74,13 @@ class build_job_action(object): |
113 |
build_use_flags = build_use_flags + flags + " " |
114 |
filetext = '=' + k + ' ' + build_use_flags |
115 |
log_msg = "filetext: %s" % filetext |
116 |
- add_tbc_logs(self._session, log_msg, "info", self._config_id) |
117 |
+ add_logs(self._session, log_msg, "info", self._config_id) |
118 |
with open("/etc/portage/package.use/99_autounmask", "a") as f: |
119 |
f.write(filetext) |
120 |
f.write('\n') |
121 |
f.close |
122 |
log_msg = "build_cpv_list: %s" % (build_cpv_list,) |
123 |
- add_tbc_logs(self._session, log_msg, "info", self._config_id) |
124 |
+ add_logs(self._session, log_msg, "info", self._config_id) |
125 |
|
126 |
# We remove the binary package if removebin is true |
127 |
if build_dict['removebin']: |
128 |
@@ -91,7 +91,7 @@ class build_job_action(object): |
129 |
os.remove(binfile) |
130 |
except: |
131 |
log_msg = "Binary file was not removed or found: %s" % (binfile,) |
132 |
- add_tbc_logs(self._session, log_msg, "info", self._config_id) |
133 |
+ add_logs(self._session, log_msg, "info", self._config_id) |
134 |
|
135 |
argscmd = [] |
136 |
for emerge_option in build_dict['emerge_options']: |
137 |
@@ -108,7 +108,7 @@ class build_job_action(object): |
138 |
argscmd.append(build_cpv) |
139 |
print("Emerge options: %s" % argscmd) |
140 |
log_msg = "argscmd: %s" % (argscmd,) |
141 |
- add_tbc_logs(self._session, log_msg, "info", self._config_id) |
142 |
+ add_logs(self._session, log_msg, "info", self._config_id) |
143 |
|
144 |
# Call main_emerge to build the package in build_cpv_list |
145 |
print("Build: %s" % build_dict) |
146 |
@@ -127,7 +127,7 @@ class build_job_action(object): |
147 |
if is_build_job_done(self._session, build_dict['build_job_id']): |
148 |
update_buildjobs_status(self._session, build_dict['build_job_id'], 'Looked', self._config_id) |
149 |
log_msg = "build_job %s was not removed" % (build_dict['build_job_id'],) |
150 |
- add_tbc_logs(self._session, log_msg, "info", self._config_id) |
151 |
+ add_logs(self._session, log_msg, "info", self._config_id) |
152 |
print("qurery was not removed") |
153 |
build_dict['type_fail'] = "Querey was not removed" |
154 |
build_dict['check_fail'] = True |
155 |
@@ -136,7 +136,7 @@ class build_job_action(object): |
156 |
build_dict['type_fail'] = "Emerge faild" |
157 |
build_dict['check_fail'] = True |
158 |
log_msg = "Emerge faild!" |
159 |
- add_tbc_logs(self._session, log_msg, "info", self._config_id) |
160 |
+ add_logs(self._session, log_msg, "info", self._config_id) |
161 |
return True |
162 |
return False |
163 |
|
164 |
@@ -147,13 +147,13 @@ class build_job_action(object): |
165 |
return |
166 |
print("build_dict: %s" % (build_dict,)) |
167 |
log_msg = "build_dict: %s" % (build_dict,) |
168 |
- add_tbc_logs(self._session, log_msg, "info", self._config_id) |
169 |
+ add_logs(self._session, log_msg, "info", self._config_id) |
170 |
if not build_dict['ebuild_id'] is None and build_dict['checksum'] is not None: |
171 |
settings, trees, mtimedb = load_emerge_config() |
172 |
portdb = trees[settings["ROOT"]]["porttree"].dbapi |
173 |
buildqueru_cpv_dict = self.make_build_list(build_dict, settings, portdb) |
174 |
log_msg = "buildqueru_cpv_dict: %s" % (buildqueru_cpv_dict,) |
175 |
- add_tbc_logs(self._session, log_msg, "info", self._config_id) |
176 |
+ add_logs(self._session, log_msg, "info", self._config_id) |
177 |
if buildqueru_cpv_dict is None: |
178 |
return |
179 |
fail_build_procces = self.build_procces(buildqueru_cpv_dict, build_dict, settings, portdb) |
180 |
|
181 |
diff --git a/tbc/pym/build_log.py b/tbc/pym/build_log.py |
182 |
index 26735e2..9923b61 100644 |
183 |
--- a/tbc/pym/build_log.py |
184 |
+++ b/tbc/pym/build_log.py |
185 |
@@ -26,7 +26,7 @@ from tbc.package import tbc_package |
186 |
from tbc.readconf import read_config_settings |
187 |
from tbc.flags import tbc_use_flags |
188 |
from tbc.ConnectionManager import NewConnection |
189 |
-from tbc.sqlquerys import add_tbc_logs, get_config_id, get_ebuild_id_db, add_new_buildlog, \ |
190 |
+from tbc.sqlquerys import add_logs, get_config_id, get_ebuild_id_db, add_new_buildlog, \ |
191 |
get_package_info, get_build_job_id, get_use_id, get_config_info, get_hilight_info, get_error_info_list, \ |
192 |
add_e_info, get_fail_times, add_fail_times, update_fail_times, del_old_build_jobs, add_old_ebuild, \ |
193 |
update_buildjobs_status, update_manifest_sql, add_repoman_qa |
194 |
@@ -40,7 +40,7 @@ def get_build_dict_db(session, config_id, settings, tbc_settings_dict, pkg): |
195 |
repo = pkg.repo |
196 |
ebuild_version = cpv_getversion(pkg.cpv) |
197 |
log_msg = "Logging %s:%s" % (pkg.cpv, repo,) |
198 |
- add_tbc_logs(session, log_msg, "info", config_id) |
199 |
+ add_logs(session, log_msg, "info", config_id) |
200 |
PackageInfo = get_package_info(session, categories, package, repo) |
201 |
build_dict = {} |
202 |
build_dict['ebuild_version'] = ebuild_version |
203 |
@@ -75,19 +75,19 @@ def get_build_dict_db(session, config_id, settings, tbc_settings_dict, pkg): |
204 |
if status: |
205 |
if ebuild_id_list is None: |
206 |
log_msg = "%s:%s Don't have any ebuild_id!" % (pkg.cpv, repo,) |
207 |
- add_tbc_logs(session, log_msg, "info", config_id) |
208 |
+ add_logs(session, log_msg, "info", config_id) |
209 |
update_manifest_sql(session, build_dict['package_id'], "0") |
210 |
init_package = tbc_package(session, settings, myportdb, config_id, tbc_settings_dict) |
211 |
init_package.update_package_db(build_dict['package_id']) |
212 |
ebuild_id_list, status = get_ebuild_id_db(session, build_dict['checksum'], build_dict['package_id']) |
213 |
if status and ebuild_id_list is None: |
214 |
log_msg = "%s:%s Don't have any ebuild_id!" % (pkg.cpv, repo,) |
215 |
- add_tbc_logs(session, log_msg, "error", config_id) |
216 |
+ add_logs(session, log_msg, "error", config_id) |
217 |
else: |
218 |
old_ebuild_id_list = [] |
219 |
for ebuild_id in ebuild_id_list: |
220 |
log_msg = "%s:%s:%s Dups of checksums" % (pkg.cpv, repo, ebuild_id,) |
221 |
- add_tbc_logs(session, log_msg, "error", config_id) |
222 |
+ add_logs(session, log_msg, "error", config_id) |
223 |
old_ebuild_id_list.append(ebuild_id) |
224 |
add_old_ebuild(session, old_ebuild_id_list) |
225 |
return |
226 |
@@ -248,7 +248,7 @@ def add_buildlog_main(settings, pkg, trees): |
227 |
build_dict = get_build_dict_db(session, config_id, settings, tbc_settings_dict, pkg) |
228 |
if build_dict is None: |
229 |
log_msg = "Package %s:%s is NOT logged." % (pkg.cpv, pkg.repo,) |
230 |
- add_tbc_logs(session, log_msg, "info", config_id) |
231 |
+ add_logs(session, log_msg, "info", config_id) |
232 |
session.close |
233 |
return |
234 |
build_log_dict = {} |
235 |
@@ -265,18 +265,18 @@ def add_buildlog_main(settings, pkg, trees): |
236 |
build_log_dict['log_hash'] = log_hash.hexdigest() |
237 |
build_log_dict['logfilename'] = settings.get("PORTAGE_LOG_FILE").split(host_config)[1] |
238 |
log_msg = "Logfile name: %s" % (settings.get("PORTAGE_LOG_FILE"),) |
239 |
- add_tbc_logs(session, log_msg, "info", config_id) |
240 |
+ add_logs(session, log_msg, "info", config_id) |
241 |
build_log_dict['emerge_info'] = get_emerge_info_id(settings, trees, session, config_id) |
242 |
log_id = add_new_buildlog(session, build_dict, build_log_dict) |
243 |
|
244 |
if log_id is None: |
245 |
log_msg = "Package %s:%s is NOT logged." % (pkg.cpv, pkg.repo,) |
246 |
- add_tbc_logs(session, log_msg, "info", config_id) |
247 |
+ add_logs(session, log_msg, "info", config_id) |
248 |
else: |
249 |
add_repoman_qa(session, build_log_dict, log_id) |
250 |
os.chmod(settings.get("PORTAGE_LOG_FILE"), 0o664) |
251 |
log_msg = "Package: %s:%s is logged." % (pkg.cpv, pkg.repo,) |
252 |
- add_tbc_logs(session, log_msg, "info", config_id) |
253 |
+ add_logs(session, log_msg, "info", config_id) |
254 |
print("\n>>> Logging %s:%s\n" % (pkg.cpv, pkg.repo,)) |
255 |
session.close |
256 |
|
257 |
|
258 |
diff --git a/tbc/pym/check_setup.py b/tbc/pym/check_setup.py |
259 |
index afd6580..7367125 100644 |
260 |
--- a/tbc/pym/check_setup.py |
261 |
+++ b/tbc/pym/check_setup.py |
262 |
@@ -8,12 +8,12 @@ import errno |
263 |
|
264 |
from portage.exception import DigestException, FileNotFound, ParseError, PermissionDenied |
265 |
from tbc.text import get_file_text |
266 |
-from tbc.sqlquerys import get_config_all_info, add_tbc_logs, get_configmetadata_info, get_setup_info |
267 |
+from tbc.sqlquerys import get_config_all_info, add_logs, get_configmetadata_info, get_setup_info |
268 |
from tbc.sync import git_pull |
269 |
|
270 |
def check_make_conf(session, config_id, tbc_settings_dict): |
271 |
log_msg = "Checking configs for changes and errors" |
272 |
- add_tbc_logs(session, log_msg, "info", config_id) |
273 |
+ add_logs(session, log_msg, "info", config_id) |
274 |
git_repo = tbc_settings_dict['tbc_gitrepopath'] + "/" |
275 |
git_pull(session, git_repo, config_id) |
276 |
configsDict = {} |
277 |
@@ -37,19 +37,19 @@ def check_make_conf(session, config_id, tbc_settings_dict): |
278 |
ConfigsMetaDataInfo.ConfigErrorText = str(e) |
279 |
ConfigsMetaDataInfo.Active = False |
280 |
log_msg = "%s FAIL!" % (ConfigInfo.Hostname,) |
281 |
- add_tbc_logs(session, log_msg, "info", config_id) |
282 |
+ add_logs(session, log_msg, "info", config_id) |
283 |
session.commit() |
284 |
else: |
285 |
ConfigsMetaDataInfo.Active = True |
286 |
log_msg = "%s PASS" % (ConfigInfo.Hostname,) |
287 |
- add_tbc_logs(session, log_msg, "info", config_id) |
288 |
+ add_logs(session, log_msg, "info", config_id) |
289 |
session.commit() |
290 |
if make_conf_checksum_tree != ConfigsMetaDataInfo.Checksum: |
291 |
ConfigsMetaDataInfo.MakeConfText = get_file_text(make_conf_file) |
292 |
ConfigsMetaDataInfo.Checksum = make_conf_checksum_tree |
293 |
session.commit() |
294 |
log_msg = "Checking configs for changes and errors ... Done" |
295 |
- add_tbc_logs(session, log_msg, "info", config_id) |
296 |
+ add_logs(session, log_msg, "info", config_id) |
297 |
|
298 |
def check_make_conf_guest(session, tbc_settings_dict, config_id): |
299 |
git_repo = tbc_settings_dict['tbc_gitrepopath'] + "/" |
300 |
|
301 |
diff --git a/tbc/pym/jobs.py b/tbc/pym/jobs.py |
302 |
index 830aa07..785bd21 100644 |
303 |
--- a/tbc/pym/jobs.py |
304 |
+++ b/tbc/pym/jobs.py |
305 |
@@ -5,7 +5,7 @@ from __future__ import print_function |
306 |
from tbc.sync import git_repo_sync_main |
307 |
#from tbc.buildquerydb import add_buildquery_main, del_buildquery_main |
308 |
from tbc.updatedb import update_db_main |
309 |
-from tbc.sqlquerys import get_config_id, add_tbc_logs, get_jobs, update_job_list |
310 |
+from tbc.sqlquerys import get_config_id, add_logs, get_jobs, update_job_list |
311 |
|
312 |
def jobs_main(session, config_id): |
313 |
JobsInfo = get_jobs(session, config_id) |
314 |
@@ -16,55 +16,55 @@ def jobs_main(session, config_id): |
315 |
run_config_id = JobInfo.RunConfigId |
316 |
job_id = JobInfo.JobId |
317 |
log_msg = "Job: %s Type: %s" % (job_id, job,) |
318 |
- add_tbc_logs(session, log_msg, "info", config_id) |
319 |
+ add_logs(session, log_msg, "info", config_id) |
320 |
if job == "addbuildquery": |
321 |
update_job_list(session, "Runing", job_id) |
322 |
log_msg = "Job %s is runing." % (job_id,) |
323 |
- add_tbc_logs(session, log_msg, "info", config_id) |
324 |
+ add_logs(session, log_msg, "info", config_id) |
325 |
#result = add_buildquery_main(run_config_id) |
326 |
#if result is True: |
327 |
# update_job_list(session, "Done", job_id) |
328 |
# log_msg = "Job %s is done.." % (job_id,) |
329 |
- # add_tbc_logs(session, log_msg, "info", config_id) |
330 |
+ # add_logs(session, log_msg, "info", config_id) |
331 |
#else: |
332 |
# update_job_list(session, "Fail", job_id) |
333 |
# log_msg = "Job %s did fail." % (job_id,) |
334 |
- # add_tbc_logs(session, log_msg, "info", config_id) |
335 |
+ # add_logs(session, log_msg, "info", config_id) |
336 |
elif job == "delbuildquery": |
337 |
update_job_list(session, "Runing", job_id) |
338 |
log_msg = "Job %s is runing." % (job_id,) |
339 |
- add_tbc_logs(session, log_msg, "info", config_id) |
340 |
+ add_logs(session, log_msg, "info", config_id) |
341 |
#result = del_buildquery_main(config_id) |
342 |
#if result is True: |
343 |
# update_job_list(session, "Done", job_id) |
344 |
# log_msg = "Job %s is done.." % (job_id,) |
345 |
- # add_tbc_logs(session, log_msg, "info", config_id) |
346 |
+ # add_logs(session, log_msg, "info", config_id) |
347 |
#else: |
348 |
# update_job_list(session, "Fail", job_id) |
349 |
# log_msg = "Job %s did fail." % (job_id,) |
350 |
- # add_tbc_logs(session, log_msg, "info", config_id) |
351 |
+ # add_logs(session, log_msg, "info", config_id) |
352 |
elif job == "esync": |
353 |
update_job_list(session, "Runing", job_id) |
354 |
log_msg = "Job %s is runing." % (job_id,) |
355 |
- add_tbc_logs(session, log_msg, "info", config_id) |
356 |
+ add_logs(session, log_msg, "info", config_id) |
357 |
if update_db_main(session, git_repo_sync_main(session), config_id): |
358 |
update_job_list(session, "Done", job_id) |
359 |
log_msg = "Job %s is done.." % (job_id,) |
360 |
- add_tbc_logs(session, log_msg, "info", config_id) |
361 |
+ add_logs(session, log_msg, "info", config_id) |
362 |
else: |
363 |
update_job_list(session, "Fail", job_id) |
364 |
log_msg = "Job %s did fail." % (job_id,) |
365 |
- add_tbc_logs(session, log_msg, "info", config_id) |
366 |
+ add_logs(session, log_msg, "info", config_id) |
367 |
elif job == "updatedb": |
368 |
update_job_list(session, "Runing", job_id) |
369 |
log_msg = "Job %s is runing." % (job_id,) |
370 |
- add_tbc_logs(session, log_msg, "info", config_id) |
371 |
+ add_logs(session, log_msg, "info", config_id) |
372 |
if update_db_main(session, None, config_id): |
373 |
update_job_list(session, "Done", job_id) |
374 |
log_msg = "Job %s is done.." % (job_id,) |
375 |
- add_tbc_logs(session, log_msg, "info", config_id) |
376 |
+ add_logs(session, log_msg, "info", config_id) |
377 |
else: |
378 |
update_job_list(session, "Fail", job_id) |
379 |
log_msg = "Job %s did fail." % (job_id,) |
380 |
- add_tbc_logs(session, log_msg, "info", config_id) |
381 |
+ add_logs(session, log_msg, "info", config_id) |
382 |
return |
383 |
|
384 |
diff --git a/tbc/pym/package.py b/tbc/pym/package.py |
385 |
index a61a1c9..4dac33e 100644 |
386 |
--- a/tbc/pym/package.py |
387 |
+++ b/tbc/pym/package.py |
388 |
@@ -9,7 +9,7 @@ from tbc.manifest import tbc_manifest |
389 |
from tbc.text import get_ebuild_cvs_revision |
390 |
from tbc.flags import tbc_use_flags |
391 |
from tbc.qachecks import digestcheck, check_repoman |
392 |
-from tbc.sqlquerys import add_tbc_logs, get_package_info, get_config_info, \ |
393 |
+from tbc.sqlquerys import add_logs, get_package_info, get_config_info, \ |
394 |
add_new_build_job, add_new_ebuild_sql, get_ebuild_id_list, add_old_ebuild, \ |
395 |
get_package_metadata_sql, update_package_metadata, update_manifest_sql, \ |
396 |
get_package_info_from_package_id, get_config_all_info, add_new_package_sql, \ |
397 |
@@ -94,9 +94,9 @@ class tbc_package(object): |
398 |
except: |
399 |
ebuild_version_checksum_tree = "0" |
400 |
log_msg = "QA: Can't checksum the ebuild file. %s on repo %s" % (cpv, repo,) |
401 |
- add_tbc_logs(self._session, log_msg, "info", self._config_id) |
402 |
+ add_logs(self._session, log_msg, "info", self._config_id) |
403 |
log_msg = "C %s:%s ... Fail." % (cpv, repo) |
404 |
- add_tbc_logs(self._session, log_msg, "info", self._config_id) |
405 |
+ add_logs(self._session, log_msg, "info", self._config_id) |
406 |
ebuild_version_cvs_revision_tree = '0' |
407 |
else: |
408 |
ebuild_version_cvs_revision_tree = get_ebuild_cvs_revision(pkgdir + "/" + package + "-" + ebuild_version_tree + ".ebuild") |
409 |
@@ -108,7 +108,7 @@ class tbc_package(object): |
410 |
# so it can be updated next time we update the db |
411 |
if ebuild_version_metadata_tree is None: |
412 |
log_msg = " QA: %s have broken metadata on repo %s" % (cpv, repo) |
413 |
- add_tbc_logs(self._session, log_msg, "info", self._config_id) |
414 |
+ add_logs(self._session, log_msg, "info", self._config_id) |
415 |
ebuild_version_metadata_tree = ['','','','','','','','','','','','','','','','','','','','','','','','',''] |
416 |
ebuild_version_checksum_tree = '0' |
417 |
|
418 |
@@ -151,7 +151,7 @@ class tbc_package(object): |
419 |
# B = Build cpv use-flags config |
420 |
# FIXME log_msg need a fix to log the use flags corect. |
421 |
log_msg = "B %s:%s USE: %s Setup: %s" % (k, v['repo'], use_flagsDict, setup_id,) |
422 |
- add_tbc_logs(self._session, log_msg, "info", self._config_id) |
423 |
+ add_logs(self._session, log_msg, "info", self._config_id) |
424 |
i = i +1 |
425 |
|
426 |
def get_package_metadataDict(self, pkgdir, package_id): |
427 |
@@ -176,7 +176,7 @@ class tbc_package(object): |
428 |
attDict['metadata_xml_email'] = md_email_list |
429 |
else: |
430 |
log_msg = "Metadata file %s missing Email" % (pkgdir + "/metadata.xml") |
431 |
- add_tbc_logs(self._session, log_msg, "qa", self._config_id) |
432 |
+ add_logs(self._session, log_msg, "qa", self._config_id) |
433 |
attDict['metadata_xml_email'] = False |
434 |
attDict['metadata_xml_checksum'] = portage.checksum.sha256hash(pkgdir + "/metadata.xml")[0] |
435 |
#attDict['metadata_xml_text'] = metadata_xml_text_tree |
436 |
@@ -249,9 +249,9 @@ class tbc_package(object): |
437 |
# C = Checking |
438 |
# N = New Package |
439 |
log_msg = "C %s:%s" % (cp, repo) |
440 |
- add_tbc_logs(self._session, log_msg, "info", self._config_id) |
441 |
+ add_logs(self._session, log_msg, "info", self._config_id) |
442 |
log_msg = "N %s:%s" % (cp, repo) |
443 |
- add_tbc_logs(self._session, log_msg, "info", self._config_id) |
444 |
+ add_logs(self._session, log_msg, "info", self._config_id) |
445 |
repodir = self._myportdb.getRepositoryPath(repo) |
446 |
pkgdir = repodir + "/" + cp # Get RepoDIR + cp |
447 |
|
448 |
@@ -267,9 +267,9 @@ class tbc_package(object): |
449 |
ebuild_list_tree = self._myportdb.cp_list(cp, use_cache=1, mytree=mytree) |
450 |
if ebuild_list_tree == []: |
451 |
log_msg = "QA: Can't get the ebuilds list. %s:%s" % (cp, repo,) |
452 |
- add_tbc_logs(self._session, log_msg, "info", self._config_id) |
453 |
+ add_logs(self._session, log_msg, "info", self._config_id) |
454 |
log_msg = "C %s:%s ... Fail." % (cp, repo) |
455 |
- add_tbc_logs(self._session, log_msg, "info", self._config_id) |
456 |
+ add_logs(self._session, log_msg, "info", self._config_id) |
457 |
return None |
458 |
|
459 |
# Make the needed packageDict with ebuild infos so we can add it later to the db. |
460 |
@@ -280,12 +280,12 @@ class tbc_package(object): |
461 |
repoman_fail = check_repoman(self._mysettings, self._myportdb, cpv, repo) |
462 |
if repoman_fail: |
463 |
log_msg = "Repoman %s:%s ... Fail." % (cpv, repo) |
464 |
- add_tbc_logs(self._session, log_msg, "error", self._config_id) |
465 |
+ add_logs(self._session, log_msg, "error", self._config_id) |
466 |
packageDict[cpv] = self.get_packageDict(pkgdir, cpv, repo) |
467 |
|
468 |
self.add_package(packageDict, package_metadataDict, package_id, new_ebuild_id_list, old_ebuild_id_list, manifest_checksum_tree) |
469 |
log_msg = "C %s:%s ... Done." % (cp, repo) |
470 |
- add_tbc_logs(self._session, log_msg, "info", self._config_id) |
471 |
+ add_logs(self._session, log_msg, "info", self._config_id) |
472 |
|
473 |
def update_package_db(self, package_id): |
474 |
# Update the categories and package with new info |
475 |
@@ -294,7 +294,7 @@ class tbc_package(object): |
476 |
cp = CategoryInfo.Category + '/' + PackageInfo.Package |
477 |
repo = RepoInfo.Repo |
478 |
log_msg = "C %s:%s" % (cp, repo) |
479 |
- add_tbc_logs(self._session, log_msg, "info", self._config_id) |
480 |
+ add_logs(self._session, log_msg, "info", self._config_id) |
481 |
repodir = self._myportdb.getRepositoryPath(repo) |
482 |
pkgdir = repodir + "/" + cp # Get RepoDIR + cp |
483 |
mytree = [] |
484 |
@@ -308,7 +308,7 @@ class tbc_package(object): |
485 |
|
486 |
# U = Update |
487 |
log_msg = "U %s:%s" % (cp, repo) |
488 |
- add_tbc_logs(self._session, log_msg, "info", self._config_id) |
489 |
+ add_logs(self._session, log_msg, "info", self._config_id) |
490 |
|
491 |
# Get the ebuild list for cp |
492 |
old_ebuild_id_list = [] |
493 |
@@ -321,15 +321,15 @@ class tbc_package(object): |
494 |
cpv = cp + "-" + EbuildInfo.Version |
495 |
# R = remove ebuild |
496 |
log_msg = "R %s:%s" % (cpv, repo,) |
497 |
- add_tbc_logs(self._session, log_msg, "info", self._config_id) |
498 |
+ add_logs(self._session, log_msg, "info", self._config_id) |
499 |
add_old_ebuild(session, old_ebuild_id_list) |
500 |
log_msg = "C %s:%s ... Done." % (cp, repo) |
501 |
- add_tbc_logs(self._session, log_msg, "info", self._config_id) |
502 |
+ add_logs(self._session, log_msg, "info", self._config_id) |
503 |
else: |
504 |
log_msg = "QA: Can't get the ebuilds list. %s:%s" % (cp, repo,) |
505 |
- add_tbc_logs(self._session, log_msg, "info", self._config_id) |
506 |
+ add_logs(self._session, log_msg, "info", self._config_id) |
507 |
log_msg = "C %s:%s ... Fail." % (cp, repo) |
508 |
- add_tbc_logs(self._session, log_msg, "info", self._config_id) |
509 |
+ add_logs(self._session, log_msg, "info", self._config_id) |
510 |
return |
511 |
packageDict ={} |
512 |
new_ebuild_id_list = [] |
513 |
@@ -353,7 +353,7 @@ class tbc_package(object): |
514 |
ebuilds_id , status = get_ebuild_id_db(self._session, checksum, package_id) |
515 |
for ebuild_id in ebuilds_id: |
516 |
log_msg = "U %s:%s:%s Dups of checksums" % (cpv, repo, ebuild_id,) |
517 |
- add_tbc_logs(self._session, log_msg, "error", self._config_id) |
518 |
+ add_logs(self._session, log_msg, "error", self._config_id) |
519 |
dupe_ebuild_id_list.append(ebuild_id) |
520 |
add_old_ebuild(self._session, dupe_ebuild_id_list) |
521 |
ebuild_version_manifest_checksum_db = None |
522 |
@@ -370,11 +370,11 @@ class tbc_package(object): |
523 |
if ebuild_version_manifest_checksum_db is None: |
524 |
# N = New ebuild |
525 |
log_msg = "N %s:%s" % (cpv, repo,) |
526 |
- add_tbc_logs(self._session, log_msg, "info", self._config_id) |
527 |
+ add_logs(self._session, log_msg, "info", self._config_id) |
528 |
elif ebuild_version_checksum_tree != ebuild_version_manifest_checksum_db: |
529 |
# U = Updated ebuild |
530 |
log_msg = "U %s:%s" % (cpv, repo,) |
531 |
- add_tbc_logs(self._session, log_msg, "info", self._config_id) |
532 |
+ add_logs(self._session, log_msg, "info", self._config_id) |
533 |
else: |
534 |
# Remove cpv from packageDict and add ebuild to new ebuils list |
535 |
del packageDict[cpv] |
536 |
@@ -384,4 +384,4 @@ class tbc_package(object): |
537 |
self.add_package(packageDict, package_metadataDict, package_id, new_ebuild_id_list, old_ebuild_id_list, manifest_checksum_tree) |
538 |
|
539 |
log_msg = "C %s:%s ... Done." % (cp, repo) |
540 |
- add_tbc_logs(self._session, log_msg, "info", self._config_id) |
541 |
+ add_logs(self._session, log_msg, "info", self._config_id) |
542 |
|
543 |
diff --git a/tbc/pym/sqlquerys.py b/tbc/pym/sqlquerys.py |
544 |
index 097ded2..c674805 100644 |
545 |
--- a/tbc/pym/sqlquerys.py |
546 |
+++ b/tbc/pym/sqlquerys.py |
547 |
@@ -17,7 +17,7 @@ def get_config_id(session, setup, host): |
548 |
ConfigInfo = session.query(Configs).filter_by(SetupId = SetupInfo.SetupId).filter_by(Hostname = host).one() |
549 |
return ConfigInfo.ConfigId |
550 |
|
551 |
-def add_tbc_logs(session, log_msg, log_type, config_id): |
552 |
+def add_logs(session, log_msg, log_type, config_id): |
553 |
Add_Log = Logs(ConfigId = config_id, LogType = log_type, Msg = log_msg) |
554 |
session.add(Add_Log) |
555 |
session.commit() |
556 |
|
557 |
diff --git a/tbc/pym/sync.py b/tbc/pym/sync.py |
558 |
index 6dab7f3..cc29f8e 100644 |
559 |
--- a/tbc/pym/sync.py |
560 |
+++ b/tbc/pym/sync.py |
561 |
@@ -11,7 +11,7 @@ import re |
562 |
from pygit2 import Repository, GIT_MERGE_ANALYSIS_FASTFORWARD, GIT_MERGE_ANALYSIS_NORMAL, \ |
563 |
GIT_MERGE_ANALYSIS_UP_TO_DATE |
564 |
|
565 |
-from tbc.sqlquerys import get_config_id, add_tbc_logs, get_config_all_info, get_configmetadata_info |
566 |
+from tbc.sqlquerys import get_config_id, add_logs, get_config_all_info, get_configmetadata_info |
567 |
from tbc.readconf import read_config_settings |
568 |
|
569 |
def git_repos_list(session, myportdb): |
570 |
@@ -68,7 +68,7 @@ def git_sync_main(session): |
571 |
myportdb = portage.portdbapi(mysettings=mysettings) |
572 |
GuestBusy = True |
573 |
log_msg = "Waiting for Guest to be idel" |
574 |
- add_tbc_logs(session, log_msg, "info", config_id) |
575 |
+ add_logs(session, log_msg, "info", config_id) |
576 |
guestid_list = [] |
577 |
# check if the guests is idel |
578 |
for config in get_config_all_info(session): |
579 |
@@ -117,7 +117,7 @@ def git_sync_main(session): |
580 |
repo_cp_dict[reponame] = attr |
581 |
else: |
582 |
log_msg = "Repo is up to date" |
583 |
- add_tbc_logs(session, log_msg, "info", config_id) |
584 |
+ add_logs(session, log_msg, "info", config_id) |
585 |
|
586 |
# Need to add a clone of profiles/base for reading the tree |
587 |
try: |
588 |
@@ -129,15 +129,15 @@ def git_sync_main(session): |
589 |
pass |
590 |
|
591 |
log_msg = "Repo sync ... Done." |
592 |
- add_tbc_logs(session, log_msg, "info", config_id) |
593 |
+ add_logs(session, log_msg, "info", config_id) |
594 |
return repo_cp_dict |
595 |
|
596 |
def git_pull(session, git_repo, config_id): |
597 |
# do a gitt pull |
598 |
log_msg = "Git pull" |
599 |
- add_tbc_logs(session, log_msg, "info", config_id) |
600 |
+ add_logs(session, log_msg, "info", config_id) |
601 |
repo = git_fetch(session, git_repo, config_id) |
602 |
git_merge(session, repo, config_id) |
603 |
log_msg = "Git pull ... Done" |
604 |
- add_tbc_logs(session, log_msg, "info", config_id) |
605 |
+ add_logs(session, log_msg, "info", config_id) |
606 |
return True |
607 |
|
608 |
diff --git a/tbc/pym/updatedb.py b/tbc/pym/updatedb.py |
609 |
index 9b74093..321c34e 100644 |
610 |
--- a/tbc/pym/updatedb.py |
611 |
+++ b/tbc/pym/updatedb.py |
612 |
@@ -9,7 +9,7 @@ import time |
613 |
import portage |
614 |
from sqlalchemy.orm import scoped_session, sessionmaker |
615 |
from tbc.ConnectionManager import NewConnection |
616 |
-from tbc.sqlquerys import add_tbc_logs, get_package_info, update_repo_db, \ |
617 |
+from tbc.sqlquerys import add_logs, get_package_info, update_repo_db, \ |
618 |
update_categories_db, get_configmetadata_info, get_config_all_info, add_new_build_job, \ |
619 |
get_config_info |
620 |
from tbc.check_setup import check_make_conf |
621 |
@@ -21,7 +21,7 @@ def init_portage_settings(session, config_id, tbc_settings_dict): |
622 |
# check config setup |
623 |
check_make_conf(session, config_id, tbc_settings_dict) |
624 |
log_msg = "Check configs done" |
625 |
- add_tbc_logs(session, log_msg, "info", config_id) |
626 |
+ add_logs(session, log_msg, "info", config_id) |
627 |
|
628 |
# Get default config from the configs table and default_config=1 |
629 |
host_config = tbc_settings_dict['hostname'] +"/" + tbc_settings_dict['tbc_config'] |
630 |
@@ -30,7 +30,7 @@ def init_portage_settings(session, config_id, tbc_settings_dict): |
631 |
# Set config_root (PORTAGE_CONFIGROOT) to default_config_root |
632 |
mysettings = portage.config(config_root = default_config_root) |
633 |
log_msg = "Setting default config to: %s" % (host_config,) |
634 |
- add_tbc_logs(session, log_msg, "info", config_id) |
635 |
+ add_logs(session, log_msg, "info", config_id) |
636 |
return mysettings |
637 |
|
638 |
def update_cpv_db_pool(mysettings, myportdb, cp, repo, tbc_settings_dict, config_id): |
639 |
@@ -60,7 +60,7 @@ def update_cpv_db_pool(mysettings, myportdb, cp, repo, tbc_settings_dict, config |
640 |
def update_cpv_db(session, config_id, tbc_settings_dict): |
641 |
GuestBusy = True |
642 |
log_msg = "Waiting for Guest to be idel" |
643 |
- add_tbc_logs(session, log_msg, "info", config_id) |
644 |
+ add_logs(session, log_msg, "info", config_id) |
645 |
guestid_list = [] |
646 |
for config in get_config_all_info(session): |
647 |
if not config.Host: |
648 |
@@ -75,7 +75,7 @@ def update_cpv_db(session, config_id, tbc_settings_dict): |
649 |
time.sleep(30) |
650 |
|
651 |
log_msg = "Checking categories, package, ebuilds" |
652 |
- add_tbc_logs(session, log_msg, "info", config_id) |
653 |
+ add_logs(session, log_msg, "info", config_id) |
654 |
new_build_jobs_list = [] |
655 |
|
656 |
# Setup settings, portdb and pool |
657 |
@@ -129,7 +129,7 @@ def update_cpv_db(session, config_id, tbc_settings_dict): |
658 |
pool.close() |
659 |
pool.join() |
660 |
log_msg = "Checking categories, package and ebuilds ... done" |
661 |
- add_tbc_logs(session, log_msg, "info", config_id) |
662 |
+ add_logs(session, log_msg, "info", config_id) |
663 |
|
664 |
def update_db_main(session, repo_cp_dict, config_id): |
665 |
# Main |
666 |
@@ -138,10 +138,10 @@ def update_db_main(session, repo_cp_dict, config_id): |
667 |
# Logging |
668 |
tbc_settings_dict = reader. read_config_settings() |
669 |
log_msg = "Update db started." |
670 |
- add_tbc_logs(session, log_msg, "info", config_id) |
671 |
+ add_logs(session, log_msg, "info", config_id) |
672 |
|
673 |
# Update the cpv db |
674 |
update_cpv_db(session, repo_cp_dict, config_id, tbc_settings_dict) |
675 |
log_msg = "Update db ... Done." |
676 |
- add_tbc_logs(session, log_msg, "info", config_id) |
677 |
+ add_logs(session, log_msg, "info", config_id) |
678 |
return True |