* [gentoo-commits] proj/tinderbox-cluster:master commit in: tbc/bin/, tbc/pym/
@ 2015-05-28 21:42 Magnus Granberg
0 siblings, 0 replies; 2+ messages in thread
From: Magnus Granberg @ 2015-05-28 21:42 UTC (permalink / raw
To: gentoo-commits
commit: 69ec237e8a81b85e81542de529992e6214cba487
Author: Magnus Granberg <zorry <AT> gentoo <DOT> org>
AuthorDate: Thu May 28 21:41:32 2015 +0000
Commit: Magnus Granberg <zorry <AT> gentoo <DOT> org>
CommitDate: Thu May 28 21:41:32 2015 +0000
URL: https://gitweb.gentoo.org/proj/tinderbox-cluster.git/commit/?id=69ec237e
rename add_tbc_logs to add_logs
tbc/bin/tbc_guest_jobs | 4 ++--
tbc/bin/tbc_host_jobs | 6 +++---
tbc/pym/build_job.py | 24 ++++++++++++------------
tbc/pym/build_log.py | 18 +++++++++---------
tbc/pym/check_setup.py | 10 +++++-----
tbc/pym/jobs.py | 28 ++++++++++++++--------------
tbc/pym/package.py | 44 ++++++++++++++++++++++----------------------
tbc/pym/sqlquerys.py | 2 +-
tbc/pym/sync.py | 12 ++++++------
tbc/pym/updatedb.py | 16 ++++++++--------
10 files changed, 82 insertions(+), 82 deletions(-)
diff --git a/tbc/bin/tbc_guest_jobs b/tbc/bin/tbc_guest_jobs
index a6fa566..4f5716b 100755
--- a/tbc/bin/tbc_guest_jobs
+++ b/tbc/bin/tbc_guest_jobs
@@ -6,7 +6,7 @@
from __future__ import print_function
from tbc.readconf import read_config_settings
from tbc.ConnectionManager import NewConnection
-from tbc.sqlquerys import add_tbc_logs, get_config_id, check_host_updatedb, update_deamon_status
+from tbc.sqlquerys import add_logs, get_config_id, check_host_updatedb, update_deamon_status
from tbc.check_setup import check_configure_guest
from tbc.build_job import build_job_action
from tbc.jobs import jobs_main
@@ -24,7 +24,7 @@ def main():
Session = sessionmaker(bind=NewConnection(tbc_settings_dict))
session = Session()
config_id = get_config_id(session, config, hostname)
- add_tbc_logs(session, "Job and build deamon started.", "info", config_id)
+ add_logs(session, "Job and build deamon started.", "info", config_id)
init_build_job = build_job_action(config_id, session)
while repeat:
jobs_main(session, config)
diff --git a/tbc/bin/tbc_host_jobs b/tbc/bin/tbc_host_jobs
index 987b11a..21f9d31 100755
--- a/tbc/bin/tbc_host_jobs
+++ b/tbc/bin/tbc_host_jobs
@@ -8,7 +8,7 @@ from __future__ import print_function
from tbc.readconf import get_conf_settings
from tbc.jobs import jobs_main
from tbc.ConnectionManager import NewConnection
-from tbc.sqlquerys import add_tbc_logs, get_config_id
+from tbc.sqlquerys import add_logs, get_config_id
from sqlalchemy.orm import sessionmaker
import time
@@ -21,13 +21,13 @@ def main():
Session = sessionmaker(bind=NewConnection(tbc_settings_dict))
session = Session()
config_id = get_config_id(session, config, hostname)
- add_tbc_logs(session, "Job deamon started", "info", config_id)
+ add_logs(session, "Job deamon started", "info", config_id)
repeat = True
while repeat:
jobs_main(session, config_id)
repeat = False
time.sleep(60)
- add_tbc_logs(session, "Job deamon stoped", "info", config_id)
+ add_logs(session, "Job deamon stoped", "info", config_id)
if __name__ == "__main__":
main()
\ No newline at end of file
diff --git a/tbc/pym/build_job.py b/tbc/pym/build_job.py
index dfe6639..8e3a218 100644
--- a/tbc/pym/build_job.py
+++ b/tbc/pym/build_job.py
@@ -18,7 +18,7 @@ from tbc.qacheck import check_file_in_manifest
from tbc.main import emerge_main
from tbc.build_log import log_fail_queru
from tbc.actions import load_emerge_config
-from tbc.sqlquerys import add_tbc_logs, get_packages_to_build, update_buildjobs_status, is_build_job_done
+from tbc.sqlquerys import add_logs, get_packages_to_build, update_buildjobs_status, is_build_job_done
class build_job_action(object):
@@ -43,19 +43,19 @@ class build_job_action(object):
init_flags = tbc_use_flags(settings, portdb, cpv)
build_use_flags_list = init_flags.comper_useflags(build_dict)
log_msg = "build_use_flags_list %s" % (build_use_flags_list,)
- add_tbc_logs(self._session, log_msg, "info", self._config_id)
+ add_logs(self._session, log_msg, "info", self._config_id)
manifest_error = check_file_in_manifest(pkgdir, settings, portdb, cpv, build_use_flags_list, repo)
if manifest_error is None:
build_dict['check_fail'] = False
build_cpv_dict = {}
build_cpv_dict[cpv] = build_use_flags_list
log_msg = "build_cpv_dict: %s" % (build_cpv_dict,)
- add_tbc_logs(self._session, log_msg, "info", self._config_id)
+ add_logs(self._session, log_msg, "info", self._config_id)
return build_cpv_dict
build_dict['type_fail'] = "Manifest error"
build_dict['check_fail'] = True
log_msg = "Manifest error: %s:%s" % (cpv, manifest_error)
- add_tbc_logs(self._session, log_msg, "info", self._config_id)
+ add_logs(self._session, log_msg, "info", self._config_id)
else:
build_dict['type_fail'] = "Wrong ebuild checksum"
build_dict['check_fail'] = True
@@ -74,13 +74,13 @@ class build_job_action(object):
build_use_flags = build_use_flags + flags + " "
filetext = '=' + k + ' ' + build_use_flags
log_msg = "filetext: %s" % filetext
- add_tbc_logs(self._session, log_msg, "info", self._config_id)
+ add_logs(self._session, log_msg, "info", self._config_id)
with open("/etc/portage/package.use/99_autounmask", "a") as f:
f.write(filetext)
f.write('\n')
f.close
log_msg = "build_cpv_list: %s" % (build_cpv_list,)
- add_tbc_logs(self._session, log_msg, "info", self._config_id)
+ add_logs(self._session, log_msg, "info", self._config_id)
# We remove the binary package if removebin is true
if build_dict['removebin']:
@@ -91,7 +91,7 @@ class build_job_action(object):
os.remove(binfile)
except:
log_msg = "Binary file was not removed or found: %s" % (binfile,)
- add_tbc_logs(self._session, log_msg, "info", self._config_id)
+ add_logs(self._session, log_msg, "info", self._config_id)
argscmd = []
for emerge_option in build_dict['emerge_options']:
@@ -108,7 +108,7 @@ class build_job_action(object):
argscmd.append(build_cpv)
print("Emerge options: %s" % argscmd)
log_msg = "argscmd: %s" % (argscmd,)
- add_tbc_logs(self._session, log_msg, "info", self._config_id)
+ add_logs(self._session, log_msg, "info", self._config_id)
# Call main_emerge to build the package in build_cpv_list
print("Build: %s" % build_dict)
@@ -127,7 +127,7 @@ class build_job_action(object):
if is_build_job_done(self._session, build_dict['build_job_id']):
update_buildjobs_status(self._session, build_dict['build_job_id'], 'Looked', self._config_id)
log_msg = "build_job %s was not removed" % (build_dict['build_job_id'],)
- add_tbc_logs(self._session, log_msg, "info", self._config_id)
+ add_logs(self._session, log_msg, "info", self._config_id)
print("qurery was not removed")
build_dict['type_fail'] = "Querey was not removed"
build_dict['check_fail'] = True
@@ -136,7 +136,7 @@ class build_job_action(object):
build_dict['type_fail'] = "Emerge faild"
build_dict['check_fail'] = True
log_msg = "Emerge faild!"
- add_tbc_logs(self._session, log_msg, "info", self._config_id)
+ add_logs(self._session, log_msg, "info", self._config_id)
return True
return False
@@ -147,13 +147,13 @@ class build_job_action(object):
return
print("build_dict: %s" % (build_dict,))
log_msg = "build_dict: %s" % (build_dict,)
- add_tbc_logs(self._session, log_msg, "info", self._config_id)
+ add_logs(self._session, log_msg, "info", self._config_id)
if not build_dict['ebuild_id'] is None and build_dict['checksum'] is not None:
settings, trees, mtimedb = load_emerge_config()
portdb = trees[settings["ROOT"]]["porttree"].dbapi
buildqueru_cpv_dict = self.make_build_list(build_dict, settings, portdb)
log_msg = "buildqueru_cpv_dict: %s" % (buildqueru_cpv_dict,)
- add_tbc_logs(self._session, log_msg, "info", self._config_id)
+ add_logs(self._session, log_msg, "info", self._config_id)
if buildqueru_cpv_dict is None:
return
fail_build_procces = self.build_procces(buildqueru_cpv_dict, build_dict, settings, portdb)
diff --git a/tbc/pym/build_log.py b/tbc/pym/build_log.py
index 26735e2..9923b61 100644
--- a/tbc/pym/build_log.py
+++ b/tbc/pym/build_log.py
@@ -26,7 +26,7 @@ from tbc.package import tbc_package
from tbc.readconf import read_config_settings
from tbc.flags import tbc_use_flags
from tbc.ConnectionManager import NewConnection
-from tbc.sqlquerys import add_tbc_logs, get_config_id, get_ebuild_id_db, add_new_buildlog, \
+from tbc.sqlquerys import add_logs, get_config_id, get_ebuild_id_db, add_new_buildlog, \
get_package_info, get_build_job_id, get_use_id, get_config_info, get_hilight_info, get_error_info_list, \
add_e_info, get_fail_times, add_fail_times, update_fail_times, del_old_build_jobs, add_old_ebuild, \
update_buildjobs_status, update_manifest_sql, add_repoman_qa
@@ -40,7 +40,7 @@ def get_build_dict_db(session, config_id, settings, tbc_settings_dict, pkg):
repo = pkg.repo
ebuild_version = cpv_getversion(pkg.cpv)
log_msg = "Logging %s:%s" % (pkg.cpv, repo,)
- add_tbc_logs(session, log_msg, "info", config_id)
+ add_logs(session, log_msg, "info", config_id)
PackageInfo = get_package_info(session, categories, package, repo)
build_dict = {}
build_dict['ebuild_version'] = ebuild_version
@@ -75,19 +75,19 @@ def get_build_dict_db(session, config_id, settings, tbc_settings_dict, pkg):
if status:
if ebuild_id_list is None:
log_msg = "%s:%s Don't have any ebuild_id!" % (pkg.cpv, repo,)
- add_tbc_logs(session, log_msg, "info", config_id)
+ add_logs(session, log_msg, "info", config_id)
update_manifest_sql(session, build_dict['package_id'], "0")
init_package = tbc_package(session, settings, myportdb, config_id, tbc_settings_dict)
init_package.update_package_db(build_dict['package_id'])
ebuild_id_list, status = get_ebuild_id_db(session, build_dict['checksum'], build_dict['package_id'])
if status and ebuild_id_list is None:
log_msg = "%s:%s Don't have any ebuild_id!" % (pkg.cpv, repo,)
- add_tbc_logs(session, log_msg, "error", config_id)
+ add_logs(session, log_msg, "error", config_id)
else:
old_ebuild_id_list = []
for ebuild_id in ebuild_id_list:
log_msg = "%s:%s:%s Dups of checksums" % (pkg.cpv, repo, ebuild_id,)
- add_tbc_logs(session, log_msg, "error", config_id)
+ add_logs(session, log_msg, "error", config_id)
old_ebuild_id_list.append(ebuild_id)
add_old_ebuild(session, old_ebuild_id_list)
return
@@ -248,7 +248,7 @@ def add_buildlog_main(settings, pkg, trees):
build_dict = get_build_dict_db(session, config_id, settings, tbc_settings_dict, pkg)
if build_dict is None:
log_msg = "Package %s:%s is NOT logged." % (pkg.cpv, pkg.repo,)
- add_tbc_logs(session, log_msg, "info", config_id)
+ add_logs(session, log_msg, "info", config_id)
session.close
return
build_log_dict = {}
@@ -265,18 +265,18 @@ def add_buildlog_main(settings, pkg, trees):
build_log_dict['log_hash'] = log_hash.hexdigest()
build_log_dict['logfilename'] = settings.get("PORTAGE_LOG_FILE").split(host_config)[1]
log_msg = "Logfile name: %s" % (settings.get("PORTAGE_LOG_FILE"),)
- add_tbc_logs(session, log_msg, "info", config_id)
+ add_logs(session, log_msg, "info", config_id)
build_log_dict['emerge_info'] = get_emerge_info_id(settings, trees, session, config_id)
log_id = add_new_buildlog(session, build_dict, build_log_dict)
if log_id is None:
log_msg = "Package %s:%s is NOT logged." % (pkg.cpv, pkg.repo,)
- add_tbc_logs(session, log_msg, "info", config_id)
+ add_logs(session, log_msg, "info", config_id)
else:
add_repoman_qa(session, build_log_dict, log_id)
os.chmod(settings.get("PORTAGE_LOG_FILE"), 0o664)
log_msg = "Package: %s:%s is logged." % (pkg.cpv, pkg.repo,)
- add_tbc_logs(session, log_msg, "info", config_id)
+ add_logs(session, log_msg, "info", config_id)
print("\n>>> Logging %s:%s\n" % (pkg.cpv, pkg.repo,))
session.close
diff --git a/tbc/pym/check_setup.py b/tbc/pym/check_setup.py
index afd6580..7367125 100644
--- a/tbc/pym/check_setup.py
+++ b/tbc/pym/check_setup.py
@@ -8,12 +8,12 @@ import errno
from portage.exception import DigestException, FileNotFound, ParseError, PermissionDenied
from tbc.text import get_file_text
-from tbc.sqlquerys import get_config_all_info, add_tbc_logs, get_configmetadata_info, get_setup_info
+from tbc.sqlquerys import get_config_all_info, add_logs, get_configmetadata_info, get_setup_info
from tbc.sync import git_pull
def check_make_conf(session, config_id, tbc_settings_dict):
log_msg = "Checking configs for changes and errors"
- add_tbc_logs(session, log_msg, "info", config_id)
+ add_logs(session, log_msg, "info", config_id)
git_repo = tbc_settings_dict['tbc_gitrepopath'] + "/"
git_pull(session, git_repo, config_id)
configsDict = {}
@@ -37,19 +37,19 @@ def check_make_conf(session, config_id, tbc_settings_dict):
ConfigsMetaDataInfo.ConfigErrorText = str(e)
ConfigsMetaDataInfo.Active = False
log_msg = "%s FAIL!" % (ConfigInfo.Hostname,)
- add_tbc_logs(session, log_msg, "info", config_id)
+ add_logs(session, log_msg, "info", config_id)
session.commit()
else:
ConfigsMetaDataInfo.Active = True
log_msg = "%s PASS" % (ConfigInfo.Hostname,)
- add_tbc_logs(session, log_msg, "info", config_id)
+ add_logs(session, log_msg, "info", config_id)
session.commit()
if make_conf_checksum_tree != ConfigsMetaDataInfo.Checksum:
ConfigsMetaDataInfo.MakeConfText = get_file_text(make_conf_file)
ConfigsMetaDataInfo.Checksum = make_conf_checksum_tree
session.commit()
log_msg = "Checking configs for changes and errors ... Done"
- add_tbc_logs(session, log_msg, "info", config_id)
+ add_logs(session, log_msg, "info", config_id)
def check_make_conf_guest(session, tbc_settings_dict, config_id):
git_repo = tbc_settings_dict['tbc_gitrepopath'] + "/"
diff --git a/tbc/pym/jobs.py b/tbc/pym/jobs.py
index 830aa07..785bd21 100644
--- a/tbc/pym/jobs.py
+++ b/tbc/pym/jobs.py
@@ -5,7 +5,7 @@ from __future__ import print_function
from tbc.sync import git_repo_sync_main
#from tbc.buildquerydb import add_buildquery_main, del_buildquery_main
from tbc.updatedb import update_db_main
-from tbc.sqlquerys import get_config_id, add_tbc_logs, get_jobs, update_job_list
+from tbc.sqlquerys import get_config_id, add_logs, get_jobs, update_job_list
def jobs_main(session, config_id):
JobsInfo = get_jobs(session, config_id)
@@ -16,55 +16,55 @@ def jobs_main(session, config_id):
run_config_id = JobInfo.RunConfigId
job_id = JobInfo.JobId
log_msg = "Job: %s Type: %s" % (job_id, job,)
- add_tbc_logs(session, log_msg, "info", config_id)
+ add_logs(session, log_msg, "info", config_id)
if job == "addbuildquery":
update_job_list(session, "Runing", job_id)
log_msg = "Job %s is runing." % (job_id,)
- add_tbc_logs(session, log_msg, "info", config_id)
+ add_logs(session, log_msg, "info", config_id)
#result = add_buildquery_main(run_config_id)
#if result is True:
# update_job_list(session, "Done", job_id)
# log_msg = "Job %s is done.." % (job_id,)
- # add_tbc_logs(session, log_msg, "info", config_id)
+ # add_logs(session, log_msg, "info", config_id)
#else:
# update_job_list(session, "Fail", job_id)
# log_msg = "Job %s did fail." % (job_id,)
- # add_tbc_logs(session, log_msg, "info", config_id)
+ # add_logs(session, log_msg, "info", config_id)
elif job == "delbuildquery":
update_job_list(session, "Runing", job_id)
log_msg = "Job %s is runing." % (job_id,)
- add_tbc_logs(session, log_msg, "info", config_id)
+ add_logs(session, log_msg, "info", config_id)
#result = del_buildquery_main(config_id)
#if result is True:
# update_job_list(session, "Done", job_id)
# log_msg = "Job %s is done.." % (job_id,)
- # add_tbc_logs(session, log_msg, "info", config_id)
+ # add_logs(session, log_msg, "info", config_id)
#else:
# update_job_list(session, "Fail", job_id)
# log_msg = "Job %s did fail." % (job_id,)
- # add_tbc_logs(session, log_msg, "info", config_id)
+ # add_logs(session, log_msg, "info", config_id)
elif job == "esync":
update_job_list(session, "Runing", job_id)
log_msg = "Job %s is runing." % (job_id,)
- add_tbc_logs(session, log_msg, "info", config_id)
+ add_logs(session, log_msg, "info", config_id)
if update_db_main(session, git_repo_sync_main(session), config_id):
update_job_list(session, "Done", job_id)
log_msg = "Job %s is done.." % (job_id,)
- add_tbc_logs(session, log_msg, "info", config_id)
+ add_logs(session, log_msg, "info", config_id)
else:
update_job_list(session, "Fail", job_id)
log_msg = "Job %s did fail." % (job_id,)
- add_tbc_logs(session, log_msg, "info", config_id)
+ add_logs(session, log_msg, "info", config_id)
elif job == "updatedb":
update_job_list(session, "Runing", job_id)
log_msg = "Job %s is runing." % (job_id,)
- add_tbc_logs(session, log_msg, "info", config_id)
+ add_logs(session, log_msg, "info", config_id)
if update_db_main(session, None, config_id):
update_job_list(session, "Done", job_id)
log_msg = "Job %s is done.." % (job_id,)
- add_tbc_logs(session, log_msg, "info", config_id)
+ add_logs(session, log_msg, "info", config_id)
else:
update_job_list(session, "Fail", job_id)
log_msg = "Job %s did fail." % (job_id,)
- add_tbc_logs(session, log_msg, "info", config_id)
+ add_logs(session, log_msg, "info", config_id)
return
diff --git a/tbc/pym/package.py b/tbc/pym/package.py
index a61a1c9..4dac33e 100644
--- a/tbc/pym/package.py
+++ b/tbc/pym/package.py
@@ -9,7 +9,7 @@ from tbc.manifest import tbc_manifest
from tbc.text import get_ebuild_cvs_revision
from tbc.flags import tbc_use_flags
from tbc.qachecks import digestcheck, check_repoman
-from tbc.sqlquerys import add_tbc_logs, get_package_info, get_config_info, \
+from tbc.sqlquerys import add_logs, get_package_info, get_config_info, \
add_new_build_job, add_new_ebuild_sql, get_ebuild_id_list, add_old_ebuild, \
get_package_metadata_sql, update_package_metadata, update_manifest_sql, \
get_package_info_from_package_id, get_config_all_info, add_new_package_sql, \
@@ -94,9 +94,9 @@ class tbc_package(object):
except:
ebuild_version_checksum_tree = "0"
log_msg = "QA: Can't checksum the ebuild file. %s on repo %s" % (cpv, repo,)
- add_tbc_logs(self._session, log_msg, "info", self._config_id)
+ add_logs(self._session, log_msg, "info", self._config_id)
log_msg = "C %s:%s ... Fail." % (cpv, repo)
- add_tbc_logs(self._session, log_msg, "info", self._config_id)
+ add_logs(self._session, log_msg, "info", self._config_id)
ebuild_version_cvs_revision_tree = '0'
else:
ebuild_version_cvs_revision_tree = get_ebuild_cvs_revision(pkgdir + "/" + package + "-" + ebuild_version_tree + ".ebuild")
@@ -108,7 +108,7 @@ class tbc_package(object):
# so it can be updated next time we update the db
if ebuild_version_metadata_tree is None:
log_msg = " QA: %s have broken metadata on repo %s" % (cpv, repo)
- add_tbc_logs(self._session, log_msg, "info", self._config_id)
+ add_logs(self._session, log_msg, "info", self._config_id)
ebuild_version_metadata_tree = ['','','','','','','','','','','','','','','','','','','','','','','','','']
ebuild_version_checksum_tree = '0'
@@ -151,7 +151,7 @@ class tbc_package(object):
# B = Build cpv use-flags config
# FIXME log_msg need a fix to log the use flags corect.
log_msg = "B %s:%s USE: %s Setup: %s" % (k, v['repo'], use_flagsDict, setup_id,)
- add_tbc_logs(self._session, log_msg, "info", self._config_id)
+ add_logs(self._session, log_msg, "info", self._config_id)
i = i +1
def get_package_metadataDict(self, pkgdir, package_id):
@@ -176,7 +176,7 @@ class tbc_package(object):
attDict['metadata_xml_email'] = md_email_list
else:
log_msg = "Metadata file %s missing Email" % (pkgdir + "/metadata.xml")
- add_tbc_logs(self._session, log_msg, "qa", self._config_id)
+ add_logs(self._session, log_msg, "qa", self._config_id)
attDict['metadata_xml_email'] = False
attDict['metadata_xml_checksum'] = portage.checksum.sha256hash(pkgdir + "/metadata.xml")[0]
#attDict['metadata_xml_text'] = metadata_xml_text_tree
@@ -249,9 +249,9 @@ class tbc_package(object):
# C = Checking
# N = New Package
log_msg = "C %s:%s" % (cp, repo)
- add_tbc_logs(self._session, log_msg, "info", self._config_id)
+ add_logs(self._session, log_msg, "info", self._config_id)
log_msg = "N %s:%s" % (cp, repo)
- add_tbc_logs(self._session, log_msg, "info", self._config_id)
+ add_logs(self._session, log_msg, "info", self._config_id)
repodir = self._myportdb.getRepositoryPath(repo)
pkgdir = repodir + "/" + cp # Get RepoDIR + cp
@@ -267,9 +267,9 @@ class tbc_package(object):
ebuild_list_tree = self._myportdb.cp_list(cp, use_cache=1, mytree=mytree)
if ebuild_list_tree == []:
log_msg = "QA: Can't get the ebuilds list. %s:%s" % (cp, repo,)
- add_tbc_logs(self._session, log_msg, "info", self._config_id)
+ add_logs(self._session, log_msg, "info", self._config_id)
log_msg = "C %s:%s ... Fail." % (cp, repo)
- add_tbc_logs(self._session, log_msg, "info", self._config_id)
+ add_logs(self._session, log_msg, "info", self._config_id)
return None
# Make the needed packageDict with ebuild infos so we can add it later to the db.
@@ -280,12 +280,12 @@ class tbc_package(object):
repoman_fail = check_repoman(self._mysettings, self._myportdb, cpv, repo)
if repoman_fail:
log_msg = "Repoman %s:%s ... Fail." % (cpv, repo)
- add_tbc_logs(self._session, log_msg, "error", self._config_id)
+ add_logs(self._session, log_msg, "error", self._config_id)
packageDict[cpv] = self.get_packageDict(pkgdir, cpv, repo)
self.add_package(packageDict, package_metadataDict, package_id, new_ebuild_id_list, old_ebuild_id_list, manifest_checksum_tree)
log_msg = "C %s:%s ... Done." % (cp, repo)
- add_tbc_logs(self._session, log_msg, "info", self._config_id)
+ add_logs(self._session, log_msg, "info", self._config_id)
def update_package_db(self, package_id):
# Update the categories and package with new info
@@ -294,7 +294,7 @@ class tbc_package(object):
cp = CategoryInfo.Category + '/' + PackageInfo.Package
repo = RepoInfo.Repo
log_msg = "C %s:%s" % (cp, repo)
- add_tbc_logs(self._session, log_msg, "info", self._config_id)
+ add_logs(self._session, log_msg, "info", self._config_id)
repodir = self._myportdb.getRepositoryPath(repo)
pkgdir = repodir + "/" + cp # Get RepoDIR + cp
mytree = []
@@ -308,7 +308,7 @@ class tbc_package(object):
# U = Update
log_msg = "U %s:%s" % (cp, repo)
- add_tbc_logs(self._session, log_msg, "info", self._config_id)
+ add_logs(self._session, log_msg, "info", self._config_id)
# Get the ebuild list for cp
old_ebuild_id_list = []
@@ -321,15 +321,15 @@ class tbc_package(object):
cpv = cp + "-" + EbuildInfo.Version
# R = remove ebuild
log_msg = "R %s:%s" % (cpv, repo,)
- add_tbc_logs(self._session, log_msg, "info", self._config_id)
+ add_logs(self._session, log_msg, "info", self._config_id)
add_old_ebuild(session, old_ebuild_id_list)
log_msg = "C %s:%s ... Done." % (cp, repo)
- add_tbc_logs(self._session, log_msg, "info", self._config_id)
+ add_logs(self._session, log_msg, "info", self._config_id)
else:
log_msg = "QA: Can't get the ebuilds list. %s:%s" % (cp, repo,)
- add_tbc_logs(self._session, log_msg, "info", self._config_id)
+ add_logs(self._session, log_msg, "info", self._config_id)
log_msg = "C %s:%s ... Fail." % (cp, repo)
- add_tbc_logs(self._session, log_msg, "info", self._config_id)
+ add_logs(self._session, log_msg, "info", self._config_id)
return
packageDict ={}
new_ebuild_id_list = []
@@ -353,7 +353,7 @@ class tbc_package(object):
ebuilds_id , status = get_ebuild_id_db(self._session, checksum, package_id)
for ebuild_id in ebuilds_id:
log_msg = "U %s:%s:%s Dups of checksums" % (cpv, repo, ebuild_id,)
- add_tbc_logs(self._session, log_msg, "error", self._config_id)
+ add_logs(self._session, log_msg, "error", self._config_id)
dupe_ebuild_id_list.append(ebuild_id)
add_old_ebuild(self._session, dupe_ebuild_id_list)
ebuild_version_manifest_checksum_db = None
@@ -370,11 +370,11 @@ class tbc_package(object):
if ebuild_version_manifest_checksum_db is None:
# N = New ebuild
log_msg = "N %s:%s" % (cpv, repo,)
- add_tbc_logs(self._session, log_msg, "info", self._config_id)
+ add_logs(self._session, log_msg, "info", self._config_id)
elif ebuild_version_checksum_tree != ebuild_version_manifest_checksum_db:
# U = Updated ebuild
log_msg = "U %s:%s" % (cpv, repo,)
- add_tbc_logs(self._session, log_msg, "info", self._config_id)
+ add_logs(self._session, log_msg, "info", self._config_id)
else:
# Remove cpv from packageDict and add ebuild to new ebuils list
del packageDict[cpv]
@@ -384,4 +384,4 @@ class tbc_package(object):
self.add_package(packageDict, package_metadataDict, package_id, new_ebuild_id_list, old_ebuild_id_list, manifest_checksum_tree)
log_msg = "C %s:%s ... Done." % (cp, repo)
- add_tbc_logs(self._session, log_msg, "info", self._config_id)
+ add_logs(self._session, log_msg, "info", self._config_id)
diff --git a/tbc/pym/sqlquerys.py b/tbc/pym/sqlquerys.py
index 097ded2..c674805 100644
--- a/tbc/pym/sqlquerys.py
+++ b/tbc/pym/sqlquerys.py
@@ -17,7 +17,7 @@ def get_config_id(session, setup, host):
ConfigInfo = session.query(Configs).filter_by(SetupId = SetupInfo.SetupId).filter_by(Hostname = host).one()
return ConfigInfo.ConfigId
-def add_tbc_logs(session, log_msg, log_type, config_id):
+def add_logs(session, log_msg, log_type, config_id):
Add_Log = Logs(ConfigId = config_id, LogType = log_type, Msg = log_msg)
session.add(Add_Log)
session.commit()
diff --git a/tbc/pym/sync.py b/tbc/pym/sync.py
index 6dab7f3..cc29f8e 100644
--- a/tbc/pym/sync.py
+++ b/tbc/pym/sync.py
@@ -11,7 +11,7 @@ import re
from pygit2 import Repository, GIT_MERGE_ANALYSIS_FASTFORWARD, GIT_MERGE_ANALYSIS_NORMAL, \
GIT_MERGE_ANALYSIS_UP_TO_DATE
-from tbc.sqlquerys import get_config_id, add_tbc_logs, get_config_all_info, get_configmetadata_info
+from tbc.sqlquerys import get_config_id, add_logs, get_config_all_info, get_configmetadata_info
from tbc.readconf import read_config_settings
def git_repos_list(session, myportdb):
@@ -68,7 +68,7 @@ def git_sync_main(session):
myportdb = portage.portdbapi(mysettings=mysettings)
GuestBusy = True
log_msg = "Waiting for Guest to be idel"
- add_tbc_logs(session, log_msg, "info", config_id)
+ add_logs(session, log_msg, "info", config_id)
guestid_list = []
# check if the guests is idel
for config in get_config_all_info(session):
@@ -117,7 +117,7 @@ def git_sync_main(session):
repo_cp_dict[reponame] = attr
else:
log_msg = "Repo is up to date"
- add_tbc_logs(session, log_msg, "info", config_id)
+ add_logs(session, log_msg, "info", config_id)
# Need to add a clone of profiles/base for reading the tree
try:
@@ -129,15 +129,15 @@ def git_sync_main(session):
pass
log_msg = "Repo sync ... Done."
- add_tbc_logs(session, log_msg, "info", config_id)
+ add_logs(session, log_msg, "info", config_id)
return repo_cp_dict
def git_pull(session, git_repo, config_id):
# do a gitt pull
log_msg = "Git pull"
- add_tbc_logs(session, log_msg, "info", config_id)
+ add_logs(session, log_msg, "info", config_id)
repo = git_fetch(session, git_repo, config_id)
git_merge(session, repo, config_id)
log_msg = "Git pull ... Done"
- add_tbc_logs(session, log_msg, "info", config_id)
+ add_logs(session, log_msg, "info", config_id)
return True
diff --git a/tbc/pym/updatedb.py b/tbc/pym/updatedb.py
index 9b74093..321c34e 100644
--- a/tbc/pym/updatedb.py
+++ b/tbc/pym/updatedb.py
@@ -9,7 +9,7 @@ import time
import portage
from sqlalchemy.orm import scoped_session, sessionmaker
from tbc.ConnectionManager import NewConnection
-from tbc.sqlquerys import add_tbc_logs, get_package_info, update_repo_db, \
+from tbc.sqlquerys import add_logs, get_package_info, update_repo_db, \
update_categories_db, get_configmetadata_info, get_config_all_info, add_new_build_job, \
get_config_info
from tbc.check_setup import check_make_conf
@@ -21,7 +21,7 @@ def init_portage_settings(session, config_id, tbc_settings_dict):
# check config setup
check_make_conf(session, config_id, tbc_settings_dict)
log_msg = "Check configs done"
- add_tbc_logs(session, log_msg, "info", config_id)
+ add_logs(session, log_msg, "info", config_id)
# Get default config from the configs table and default_config=1
host_config = tbc_settings_dict['hostname'] +"/" + tbc_settings_dict['tbc_config']
@@ -30,7 +30,7 @@ def init_portage_settings(session, config_id, tbc_settings_dict):
# Set config_root (PORTAGE_CONFIGROOT) to default_config_root
mysettings = portage.config(config_root = default_config_root)
log_msg = "Setting default config to: %s" % (host_config,)
- add_tbc_logs(session, log_msg, "info", config_id)
+ add_logs(session, log_msg, "info", config_id)
return mysettings
def update_cpv_db_pool(mysettings, myportdb, cp, repo, tbc_settings_dict, config_id):
@@ -60,7 +60,7 @@ def update_cpv_db_pool(mysettings, myportdb, cp, repo, tbc_settings_dict, config
def update_cpv_db(session, config_id, tbc_settings_dict):
GuestBusy = True
log_msg = "Waiting for Guest to be idel"
- add_tbc_logs(session, log_msg, "info", config_id)
+ add_logs(session, log_msg, "info", config_id)
guestid_list = []
for config in get_config_all_info(session):
if not config.Host:
@@ -75,7 +75,7 @@ def update_cpv_db(session, config_id, tbc_settings_dict):
time.sleep(30)
log_msg = "Checking categories, package, ebuilds"
- add_tbc_logs(session, log_msg, "info", config_id)
+ add_logs(session, log_msg, "info", config_id)
new_build_jobs_list = []
# Setup settings, portdb and pool
@@ -129,7 +129,7 @@ def update_cpv_db(session, config_id, tbc_settings_dict):
pool.close()
pool.join()
log_msg = "Checking categories, package and ebuilds ... done"
- add_tbc_logs(session, log_msg, "info", config_id)
+ add_logs(session, log_msg, "info", config_id)
def update_db_main(session, repo_cp_dict, config_id):
# Main
@@ -138,10 +138,10 @@ def update_db_main(session, repo_cp_dict, config_id):
# Logging
tbc_settings_dict = reader. read_config_settings()
log_msg = "Update db started."
- add_tbc_logs(session, log_msg, "info", config_id)
+ add_logs(session, log_msg, "info", config_id)
# Update the cpv db
update_cpv_db(session, repo_cp_dict, config_id, tbc_settings_dict)
log_msg = "Update db ... Done."
- add_tbc_logs(session, log_msg, "info", config_id)
+ add_logs(session, log_msg, "info", config_id)
return True
^ permalink raw reply related [flat|nested] 2+ messages in thread
* [gentoo-commits] proj/tinderbox-cluster:master commit in: tbc/bin/, tbc/pym/
@ 2015-07-18 0:41 Magnus Granberg
0 siblings, 0 replies; 2+ messages in thread
From: Magnus Granberg @ 2015-07-18 0:41 UTC (permalink / raw
To: gentoo-commits
commit: e895db5aaa6e8056e933b1b30d14240123746602
Author: Magnus Granberg <zorry <AT> gentoo <DOT> org>
AuthorDate: Sat Jul 18 00:41:23 2015 +0000
Commit: Magnus Granberg <zorry <AT> gentoo <DOT> org>
CommitDate: Sat Jul 18 00:41:23 2015 +0000
URL: https://gitweb.gentoo.org/proj/tinderbox-cluster.git/commit/?id=e895db5a
fix small thing for host move from zobcs to tbc
tbc/bin/tbc_guest_jobs | 4 ++--
tbc/pym/build_job.py | 2 +-
tbc/pym/jobs.py | 4 ++--
tbc/pym/package.py | 8 ++++----
tbc/pym/sqlquerys.py | 2 +-
tbc/pym/sync.py | 6 +++---
tbc/pym/updatedb.py | 4 ++--
7 files changed, 15 insertions(+), 15 deletions(-)
diff --git a/tbc/bin/tbc_guest_jobs b/tbc/bin/tbc_guest_jobs
index a4e1382..721c7e1 100755
--- a/tbc/bin/tbc_guest_jobs
+++ b/tbc/bin/tbc_guest_jobs
@@ -23,10 +23,10 @@ def main():
session = Session()
config_id = get_config_id_fqdn(session, tbc_settings['hostname'])
add_logs(session, "Job and build deamon started.", "info", config_id)
- update_deamon_status(session, 'Runing', config_id)
+ update_deamon_status(session, 'Waiting', config_id)
init_build_job = build_job_action(config_id, session)
while repeat:
- jobs_main(session, config)
+ jobs_main(session, config_id)
if not check_configure_guest(session, config_id) or check_host_updatedb(session):
time.sleep(60)
continue
diff --git a/tbc/pym/build_job.py b/tbc/pym/build_job.py
index 37f2492..3629d8b 100644
--- a/tbc/pym/build_job.py
+++ b/tbc/pym/build_job.py
@@ -14,7 +14,7 @@ from portage.versions import cpv_getkey
from portage.dep import check_required_use
from tbc.depclean import do_depclean
from tbc.flags import tbc_use_flags
-from tbc.qacheck import check_file_in_manifest
+from tbc.qachecks import check_file_in_manifest
from tbc.main import emerge_main
from tbc.build_log import log_fail_queru
from tbc.actions import load_emerge_config
diff --git a/tbc/pym/jobs.py b/tbc/pym/jobs.py
index 785bd21..924421c 100644
--- a/tbc/pym/jobs.py
+++ b/tbc/pym/jobs.py
@@ -2,7 +2,7 @@
# Distributed under the terms of the GNU General Public License v2
from __future__ import print_function
-from tbc.sync import git_repo_sync_main
+from tbc.sync import git_sync_main
#from tbc.buildquerydb import add_buildquery_main, del_buildquery_main
from tbc.updatedb import update_db_main
from tbc.sqlquerys import get_config_id, add_logs, get_jobs, update_job_list
@@ -47,7 +47,7 @@ def jobs_main(session, config_id):
update_job_list(session, "Runing", job_id)
log_msg = "Job %s is runing." % (job_id,)
add_logs(session, log_msg, "info", config_id)
- if update_db_main(session, git_repo_sync_main(session), config_id):
+ if update_db_main(session, git_sync_main(session), config_id):
update_job_list(session, "Done", job_id)
log_msg = "Job %s is done.." % (job_id,)
add_logs(session, log_msg, "info", config_id)
diff --git a/tbc/pym/package.py b/tbc/pym/package.py
index 440d141..bf0ca9f 100644
--- a/tbc/pym/package.py
+++ b/tbc/pym/package.py
@@ -5,7 +5,6 @@ from __future__ import print_function
import portage
from portage.xml.metadata import MetaDataXML
from tbc.flags import tbc_use_flags
-from tbc.manifest import tbc_manifest
from tbc.text import get_ebuild_cvs_revision
from tbc.flags import tbc_use_flags
from tbc.qachecks import digestcheck, check_repoman
@@ -30,7 +29,7 @@ class tbc_package(object):
mysettings_setup = portage.config(config_root = my_new_setup)
return mysettings_setup
- def config_match_ebuild(self, cp, config_list):
+ def config_match_ebuild(self, cp, config_list, repopath):
config_cpv_dict ={}
if config_list == []:
return config_cpv_dict
@@ -220,7 +219,8 @@ class tbc_package(object):
for config in get_config_all_info(self._session):
if config.Host is False:
config_list.append(config.ConfigId)
- config_cpv_listDict = self.config_match_ebuild(cp, config_list)
+ ConfigsMetaData = get_configmetadata_info(self._session, self._config_id)
+ config_cpv_listDict = self.config_match_ebuild(cp, config_list, ConfigsMetaData.RepoPath)
# Add the ebuild to the build jobs table if needed
self.add_new_build_job_db(ebuild_id_list, packageDict, config_cpv_listDict)
@@ -326,7 +326,7 @@ class tbc_package(object):
# R = remove ebuild
log_msg = "R %s:%s" % (cpv, repo,)
add_logs(self._session, log_msg, "info", self._config_id)
- add_old_ebuild(session, old_ebuild_id_list)
+ add_old_ebuild(self._session, old_ebuild_id_list)
log_msg = "C %s:%s ... Done." % (cp, repo)
add_logs(self._session, log_msg, "info", self._config_id)
else:
diff --git a/tbc/pym/sqlquerys.py b/tbc/pym/sqlquerys.py
index 51a266c..9d7189d 100644
--- a/tbc/pym/sqlquerys.py
+++ b/tbc/pym/sqlquerys.py
@@ -8,7 +8,7 @@ from tbc.db_mapping import Configs, Logs, ConfigsMetaData, Jobs, BuildJobs, Pack
Uses, ConfigsEmergeOptions, EmergeOptions, HiLight, BuildLogs, BuildLogsConfig, BuildJobsUse, BuildJobsRedo, \
HiLightCss, BuildLogsHiLight, BuildLogsEmergeOptions, BuildLogsErrors, ErrorsInfo, EmergeInfo, BuildLogsUse, \
BuildJobsEmergeOptions, EbuildsMetadata, EbuildsIUse, Restrictions, EbuildsRestrictions, EbuildsKeywords, \
- Keywords, PackagesMetadata, Emails, PackagesEmails, Setups, BuildLogsQA, BuildLogsRepoman
+ Keywords, PackagesMetadata, Emails, PackagesEmails, Setups, BuildLogsRepomanQa
from sqlalchemy.orm.exc import NoResultFound, MultipleResultsFound
from sqlalchemy import and_, or_
diff --git a/tbc/pym/sync.py b/tbc/pym/sync.py
index c7d2ebb..39d8385 100644
--- a/tbc/pym/sync.py
+++ b/tbc/pym/sync.py
@@ -10,7 +10,8 @@ import time
import re
import git
-from tbc.sqlquerys import get_config_id_fqdn, add_logs, get_config_all_info, get_configmetadata_info
+from tbc.sqlquerys import get_config_id_fqdn, add_logs, get_config_all_info, \
+ get_configmetadata_info, get_config_info, get_setup_info
from tbc.readconf import read_config_settings
def git_repos_list(myportdb):
@@ -35,8 +36,7 @@ def git_merge(repo, info):
def git_sync_main(session):
tbc_settings = read_config_settings()
- hostname = tbc_settings_dict['hostname']
- config_id = get_config_id_fqdn(session, host)
+ config_id = get_config_id_fqdn(session, tbc_settings['hostname'])
ConfigsMetaDataInfo = get_configmetadata_info(session, config_id)
ConfigInfo = get_config_info(session, config_id)
SetupInfo = get_setup_info(session, ConfigInfo.SetupId)
diff --git a/tbc/pym/updatedb.py b/tbc/pym/updatedb.py
index 6ccf0b6..2e6b858 100644
--- a/tbc/pym/updatedb.py
+++ b/tbc/pym/updatedb.py
@@ -11,7 +11,7 @@ from sqlalchemy.orm import scoped_session, sessionmaker
from tbc.ConnectionManager import NewConnection
from tbc.sqlquerys import add_logs, get_package_info, update_repo_db, \
update_categories_db, get_configmetadata_info, get_config_all_info, add_new_build_job, \
- get_config_info
+ get_config_info, get_setup_info
from tbc.check_setup import check_make_conf
from tbc.package import tbc_package
# Get the options from the config file tbc.conf
@@ -61,7 +61,7 @@ def update_cpv_db_pool(mysettings, myportdb, cp, repo, tbc_settings, config_id):
session2.close
Session.remove()
-def update_cpv_db(session, config_id, tbc_settings):
+def update_cpv_db(session, repo_cp_dic, config_id, tbc_settings):
GuestBusy = True
log_msg = "Waiting for Guest to be idel"
add_logs(session, log_msg, "info", config_id)
^ permalink raw reply related [flat|nested] 2+ messages in thread
end of thread, other threads:[~2015-07-18 0:42 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2015-05-28 21:42 [gentoo-commits] proj/tinderbox-cluster:master commit in: tbc/bin/, tbc/pym/ Magnus Granberg
-- strict thread matches above, loose matches on Subject: below --
2015-07-18 0:41 Magnus Granberg
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox