aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'buildbot_gentoo_ci/config/workers.py')
-rw-r--r--buildbot_gentoo_ci/config/workers.py12
1 files changed, 8 insertions, 4 deletions
diff --git a/buildbot_gentoo_ci/config/workers.py b/buildbot_gentoo_ci/config/workers.py
index c29502e..7d13f46 100644
--- a/buildbot_gentoo_ci/config/workers.py
+++ b/buildbot_gentoo_ci/config/workers.py
@@ -54,11 +54,15 @@ def GetBuildDockerImage(props, docker_worker):
print(image_data)
return image_data['tag']
-def gentoo_workers(worker_data_local, worker_data_docker):
+def gentoo_workers(worker_data):
w = []
- for local_worker in worker_data_local:
+ for local_worker in worker_data['local']:
if local_worker['enable']:
w.append(worker.LocalWorker(local_worker['name']))
+ # node workers
+ for node_worker in worker_data['node']:
+ if node_worker['enable']:
+ w.append(worker.Worker(node_worker['uuid'], node_worker['password']))
# docker workers
docker_hostconfig = {}
# For use of sandbox stuff
@@ -67,8 +71,8 @@ def gentoo_workers(worker_data_local, worker_data_docker):
# libseccomp overhead
# https://github.com/seccomp/libseccomp/issues/153
docker_hostconfig['security_opt'] = ['seccomp=unconfined']
- print(worker_data_docker)
- for docker_worker in worker_data_docker:
+ print(worker_data['docker'])
+ for docker_worker in worker_data['docker']:
#FIXME: get settings from db
if docker_worker['type'] == 'build':
w.append(worker.DockerLatentWorker(docker_worker['uuid'],