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)
