commit: 78b42d38f018a98b6acdc07d60aa8c4b60b4c9c7
Author: Magnus Granberg <zorry <AT> gentoo <DOT> org>
AuthorDate: Sat Apr 18 19:50:32 2015 +0000
Commit: Magnus Granberg <zorry <AT> gentoo <DOT> org>
CommitDate: Sat Apr 18 19:50:32 2015 +0000
URL:
https://gitweb.gentoo.org/proj/tinderbox-cluster.git/commit/?id=78b42d38
rename btc to tbc
btc/bin/btc_host_jobs | 33 ------------------------
btc/bin/btc_guest_jobs => tbc/bin/tbc_guest_jobs | 22 ++++++++--------
tbc/bin/tbc_host_jobs | 33 ++++++++++++++++++++++++
3 files changed, 44 insertions(+), 44 deletions(-)
diff --git a/btc/bin/btc_host_jobs b/btc/bin/btc_host_jobs
deleted file mode 100755
index 694e1cf..0000000
--- a/btc/bin/btc_host_jobs
+++ /dev/null
@@ -1,33 +0,0 @@
-#!/usr/bin/python
-#
-# Copyright 1998-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-from __future__ import print_function
-
-from btc.readconf import get_conf_settings
-from btc.jobs import jobs_main
-from btc.ConnectionManager import NewConnection
-from btc.sqlquerys import add_btc_logs, get_config_id
-from sqlalchemy.orm import sessionmaker
-import time
-
-def main():
- # Main
- reader = get_conf_settings()
- btc_settings_dict=reader.read_btc_settings_all()
- config = btc_settings_dict['btc_config']
- hostname = btc_settings_dict['hostname']
- Session = sessionmaker(bind=NewConnection(btc_settings_dict))
- session = Session()
- config_id = get_config_id(session, config, hostname)
- add_btc_logs(session, "Job deamon started", "info", config_id)
- repeat = True
- while repeat:
- jobs_main(session, config_id)
- repeat = False
- time.sleep(60)
- add_btc_logs(session, "Job deamon stoped", "info", config_id)
-
-if __name__ == "__main__":
- main()
\ No newline at end of file
diff --git a/btc/bin/btc_guest_jobs b/tbc/bin/tbc_guest_jobs
similarity index 62%
rename from btc/bin/btc_guest_jobs
rename to tbc/bin/tbc_guest_jobs
index 12a578b..8cecba2 100755
--- a/btc/bin/btc_guest_jobs
+++ b/tbc/bin/tbc_guest_jobs
@@ -4,12 +4,12 @@
# Distributed under the terms of the GNU General Public License v2
from __future__ import print_function
-from btc.readconf import get_conf_settings
-from btc.ConnectionManager import NewConnection
-from btc.sqlquerys import add_btc_logs, get_config_id, check_host_updatedb,
update_deamon_status
-from btc.check_setup import check_configure_guest
-from btc.build_job import build_job_action
-from btc.jobs import jobs_main
+from tbc.readconf import get_conf_settings
+from tbc.ConnectionManager import NewConnection
+from tbc.sqlquerys import add_tbc_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
from sqlalchemy.orm import sessionmaker
import portage
import sys
@@ -19,13 +19,13 @@ import time
def main():
repeat = True
reader = get_conf_settings()
- btc_settings_dict=reader.read_btc_settings_all()
- config = btc_settings_dict['btc_config']
- hostname = btc_settings_dict['hostname']
- Session = sessionmaker(bind=NewConnection(btc_settings_dict))
+ tbc_settings_dict=reader.read_tbc_settings_all()
+ config = tbc_settings_dict['tbc_config']
+ hostname = tbc_settings_dict['hostname']
+ Session = sessionmaker(bind=NewConnection(tbc_settings_dict))
session = Session()
config_id = get_config_id(session, config, hostname)
- add_btc_logs(session, "Job and build deamon started.", "info",
config_id)
+ add_tbc_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
new file mode 100755
index 0000000..987b11a
--- /dev/null
+++ b/tbc/bin/tbc_host_jobs
@@ -0,0 +1,33 @@
+#!/usr/bin/python
+#
+# Copyright 1998-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+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 sqlalchemy.orm import sessionmaker
+import time
+
+def main():
+ # Main
+ reader = get_conf_settings()
+ tbc_settings_dict=reader.read_tbc_settings_all()
+ config = tbc_settings_dict['tbc_config']
+ hostname = tbc_settings_dict['hostname']
+ 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)
+ repeat = True
+ while repeat:
+ jobs_main(session, config_id)
+ repeat = False
+ time.sleep(60)
+ add_tbc_logs(session, "Job deamon stoped", "info", config_id)
+
+if __name__ == "__main__":
+ main()
\ No newline at end of file
