commit: ccd8dad636b0f58585c0c3c5eac7f80d138600ee
Author: Magnus Granberg <zorry <AT> gentoo <DOT> org>
AuthorDate: Tue Dec 20 20:25:03 2016 +0000
Commit: Magnus Granberg <zorry <AT> gentoo <DOT> org>
CommitDate: Tue Dec 20 20:25:03 2016 +0000
URL:
https://gitweb.gentoo.org/proj/tinderbox-cluster.git/commit/?id=ccd8dad6
add Waiting_on_guest
pym/tbc/db_mapping.py | 2 +-
pym/tbc/jobs.py | 4 ++--
pym/tbc/sqlquerys.py | 6 ++++++
pym/tbc/sync.py | 5 ++++-
pym/tbc/updatedb.py | 4 +++-
5 files changed, 16 insertions(+), 5 deletions(-)
diff --git a/pym/tbc/db_mapping.py b/pym/tbc/db_mapping.py
index 304dcd8..aba6ee1 100644
--- a/pym/tbc/db_mapping.py
+++ b/pym/tbc/db_mapping.py
@@ -39,7 +39,7 @@ class Logs(Base):
class Jobs(Base):
JobId = Column('job_id', Integer, primary_key=True)
JobType = Column('job_type', Enum('updatedb', 'esync', 'removeold_cpv'))
- Status = Column('status', Enum('Runing', 'Done', 'Waiting'))
+ Status = Column('status', Enum('Runing', 'Done', 'Waiting',
'Waiting_on_guest'))
User = Column('user', String(50))
ConfigId = Column('config_id', Integer, ForeignKey('configs.config_id'))
RunConfigId = Column('run_config_id', Integer,
ForeignKey('configs.config_id'))
diff --git a/pym/tbc/jobs.py b/pym/tbc/jobs.py
index efe8623..800fe87 100644
--- a/pym/tbc/jobs.py
+++ b/pym/tbc/jobs.py
@@ -46,7 +46,7 @@ def jobs_main(session, config_id):
# log_msg = "Job %s did fail." % (job_id,)
# write_log(session, log_msg, "info", config_id,
'jobs_main')
elif job == "esync":
- update_job_list(session, "Runing", job_id)
+ update_job_list(session, "Waiting_on_guest", job_id)
log_msg = "Job %s is runing." % (job_id,)
write_log(session, log_msg, "info", config_id,
'jobs_main')
if update_db_main(session, git_sync_main(session),
config_id):
@@ -58,7 +58,7 @@ def jobs_main(session, config_id):
log_msg = "Job %s did fail." % (job_id,)
write_log(session, log_msg, "info", config_id,
'jobs_main')
elif job == "updatedb":
- update_job_list(session, "Runing", job_id)
+ update_job_list(session, "Waiting_on_guest", job_id)
log_msg = "Job %s is runing." % (job_id,)
write_log(session, log_msg, "info", config_id,
'jobs_main')
if update_db_main(session, None, config_id):
diff --git a/pym/tbc/sqlquerys.py b/pym/tbc/sqlquerys.py
index 770e84e..901db08 100644
--- a/pym/tbc/sqlquerys.py
+++ b/pym/tbc/sqlquerys.py
@@ -44,6 +44,12 @@ def get_jobs(session, config_id):
return None
return JobsInfo
+def get_job_status_waiting_on_guest(session):
+ JobsInfo = session.query(Jobs).filter_by(Status =
'Waiting_on_guest').one()
+ if JobsInfo == []:
+ return None
+ return JobInfo.JobId
+
def update_job_list(session, status, job_id):
JobInfo = session.query(Jobs).filter_by(JobId = job_id).one()
JobInfo.Status = status
diff --git a/pym/tbc/sync.py b/pym/tbc/sync.py
index 7063bfb..dee13ff 100644
--- a/pym/tbc/sync.py
+++ b/pym/tbc/sync.py
@@ -11,7 +11,8 @@ import re
import git
from tbc.sqlquerys import get_config_id_fqdn, add_logs, get_config_all_info, \
- get_configmetadata_info, get_config_info, get_setup_info
+ get_configmetadata_info, get_config_info, get_setup_info,
get_job_status_waiting_on_guest, \
+ update_job_list
from tbc.readconf import read_config_settings
from tbc.log import write_log
@@ -64,6 +65,8 @@ def git_sync_main(session):
else:
time.sleep(60)
+ job_id = get_job_status_waiting_on_guest(session)
+ update_job_list(session, 'Runing', job_id)
# check git diffs witch get updated and pass that to a dict
# fetch and merge the repo
repo_cp_dict = {}
diff --git a/pym/tbc/updatedb.py b/pym/tbc/updatedb.py
index 0753d92..b6539e4 100644
--- a/pym/tbc/updatedb.py
+++ b/pym/tbc/updatedb.py
@@ -13,7 +13,7 @@ from sqlalchemy.orm import scoped_session, sessionmaker
from tbc.ConnectionManager import NewConnection
from tbc.sqlquerys import get_package_info, update_repo_db, \
update_categories_db, get_configmetadata_info, get_config_all_info,
add_new_build_job, \
- get_config_info, get_setup_info
+ get_config_info, get_setup_info, get_job_status_waiting_on_guest,
update_job_list
from tbc.check_setup import check_make_conf
from tbc.package import tbc_package
# Get the options from the config file tbc.conf
@@ -93,6 +93,8 @@ def update_cpv_db(session, repo_cp_dict, config_id,
tbc_settings):
break
time.sleep(30)
+ job_id = get_job_status_waiting_on_guest(session)
+ update_job_list(session, 'Runing', job_id)
log_msg = "Checking categories, package, ebuilds"
write_log(session, log_msg, "info", config_id, 'updatedb.update_cpv_db')
new_build_jobs_list = []
