Add support for workes, nodes, images and flavors in db

Signed-off-by: Magnus Granberg <zorry@gentoo.org>

1 files changed, 18 insertions, 19 deletions

diff --git a/master.cfg b/master.cfg
index dbdee3f..cc81d10 100644
--- a/master.cfg
+++ b/master.cfg
@@ -3,22 +3,21 @@
 from buildbot.plugins import util, secrets
 from buildbot_gentoo_ci.config import schedulers, workers, builders, service, change_source, reporters
 
-# This is a sample buildmaster config file. It must be installed as
-# 'master.cfg' in your buildmaster's base directory.
-
-#FIXME: Get workers from db or a file
-worker_data = [
-    {'uuid' : 'updatedb_1', 'password' : '', 'type' : 'local', 'enable' : True, },
-    {'uuid' : 'updatedb_2', 'password' : '', 'type' : 'local', 'enable' : True, },
-    {'uuid' : 'updatedb_3', 'password' : '', 'type' : 'local', 'enable' : True, },
-    {'uuid' : 'updatedb_4', 'password' : '', 'type' : 'local', 'enable' : True, },
-    {'uuid' : 'b89c2c1a-46e0-4ded-81dd-c51afeb7fcfa', 'password' : 'X', 'type' : 'log', 'enable' : True, },
-    {'uuid' : 'b89c2c1a-46e0-4ded-81dd-c51afeb7fcfb', 'password' : 'X', 'type' : 'log', 'enable' : True, },
-    {'uuid' : 'b89c2c1a-46e0-4ded-81dd-c51afeb7fcfc', 'password' : 'X', 'type' : 'log', 'enable' : True, },
-    {'uuid' : 'a89c2c1a-46e0-4ded-81dd-c51afeb7fcfa', 'password' : 'X', 'type' : 'docker', 'enable' : True, },
-    {'uuid' : 'a89c2c1a-46e0-4ded-81dd-c51afeb7fcfb', 'password' : 'X', 'type' : 'docker', 'enable' : True, },
-    {'uuid' : 'a89c2c1a-46e0-4ded-81dd-c51afeb7fcfd', 'password' : 'X', 'type' : 'docker', 'enable' : True, },
-    {'uuid' : 'c89c2c1a-46e0-4ded-81dd-c51afeb7fcfa', 'password' : 'X', 'type' : 'node', 'enable' : True, },
+worker_data_local = [
+    {'name' : 'updatedb_1', 'type' : 'local', 'enable' : True, },
+    {'name' : 'updatedb_2', 'type' : 'local', 'enable' : True, },
+    {'name' : 'updatedb_3', 'type' : 'local', 'enable' : True, },
+    {'name' : 'updatedb_4', 'type' : 'local', 'enable' : True, },
+]
+#FIXME: Get workers from db
+worker_data_docker = [
+    {'uuid' : 'b89c2c1a-46e0-4ded-81dd-c51afeb7fcfa', 'type' : 'log', 'enable' : True, },
+    {'uuid' : 'b89c2c1a-46e0-4ded-81dd-c51afeb7fcfb', 'type' : 'log', 'enable' : True, },
+    {'uuid' : 'b89c2c1a-46e0-4ded-81dd-c51afeb7fcfc', 'type' : 'log', 'enable' : True, },
+    {'uuid' : 'a89c2c1a-46e0-4ded-81dd-c51afeb7fcfa', 'type' : 'build', 'enable' : True, },
+    {'uuid' : 'a89c2c1a-46e0-4ded-81dd-c51afeb7fcfb', 'type' : 'build', 'enable' : True, },
+    {'uuid' : 'a89c2c1a-46e0-4ded-81dd-c51afeb7fcfc', 'type' : 'build', 'enable' : True, },
+    {'uuid' : 'a89c2c1a-46e0-4ded-81dd-c51afeb7fcfd', 'type' : 'build', 'enable' : True, },
 ]
 
 # This is the dictionary that the buildmaster pays attention to. We also use
@@ -37,7 +36,7 @@ c['secretsProviders'].append(secrets.SecretInAFile(dirname="/var/lib/buildmaster
 # The 'workers' list defines the set of recognized workers. Each element is
 # a Worker object, specifying a unique worker name and password.  The same
 # worker name and password must be configured on the worker.
-c['workers'] = workers.gentoo_workers(worker_data)
+c['workers'] = workers.gentoo_workers(worker_data_local, worker_data_docker)
 
 # 'protocols' contains information about protocols which master will use for
 # communicating with workers. You must define at least 'port' option that workers
@@ -66,7 +65,7 @@ c['schedulers'] = schedulers.gentoo_schedulers()
 # what steps, and which workers can execute them.  Note that any particular build will
 # only take place on one worker.
 
-c['builders'] = builders.gentoo_builders(worker_data)
+c['builders'] = builders.gentoo_builders(worker_data_local, worker_data_docker)
 
 ####### BUILDBOT SERVICES
 
@@ -84,7 +83,7 @@ c['services'] = reporters.gentoo_reporters(r=c['services'])
 # home pages (linked to the 'titleURL').
 
 c['title'] = "Gentoo CI"
-c['titleURL'] = "https://gentoo-ci.gentoo.org"
+c['titleURL'] = "https://ci.dev.gentoo.org"
 
 # the 'buildbotURL' string should point to the location where the buildbot's
 # internal web server is visible. This typically uses the port number set in