diff options
author | Magnus Granberg <zorry@gentoo.org> | 2023-02-15 22:30:32 +0100 |
---|---|---|
committer | Magnus Granberg <zorry@gentoo.org> | 2023-02-15 22:30:32 +0100 |
commit | b38a60cfc5b5dca25a674ebe5887737525aa353f (patch) | |
tree | e5ac95e14e7947c6dc292f6faaadb16c3564cfdf /master.cfg | |
parent | Add support for binhost on docker image build (diff) | |
download | tinderbox-cluster-b38a60cfc5b5dca25a674ebe5887737525aa353f.tar.gz tinderbox-cluster-b38a60cfc5b5dca25a674ebe5887737525aa353f.tar.bz2 tinderbox-cluster-b38a60cfc5b5dca25a674ebe5887737525aa353f.zip |
Use command shell to build docker images
Signed-off-by: Magnus Granberg <zorry@gentoo.org>
Diffstat (limited to 'master.cfg')
-rw-r--r-- | master.cfg | 14 |
1 files changed, 12 insertions, 2 deletions
@@ -3,6 +3,7 @@ from buildbot.plugins import util, secrets from buildbot_gentoo_ci.config import schedulers, workers, builders, service, change_source, reporters +#FIXME: Should have uuid worker_data_local = [ {'name' : 'updatedb_1', 'type' : 'local', 'enable' : True, }, {'name' : 'updatedb_2', 'type' : 'local', 'enable' : True, }, @@ -19,6 +20,15 @@ worker_data_docker = [ {'uuid' : 'a89c2c1a-46e0-4ded-81dd-c51afeb7fcfc', 'type' : 'build', 'enable' : True, }, {'uuid' : 'a89c2c1a-46e0-4ded-81dd-c51afeb7fcfd', 'type' : 'build', 'enable' : True, }, ] +worker_data_node = [ + {'uuid' : 'c89c2c1a-46e0-4ded-81dd-c51afeb7fcfa', 'type' : 'node', 'enable' : True, 'password' : util.Secret("Node.c89c2c1a-46e0-4ded-81dd-c51afeb7fcfa")}, +] + +worker_data = { + 'local' : worker_data_local, + 'docker' : worker_data_docker, + 'node' : worker_data_node, +} # This is the dictionary that the buildmaster pays attention to. We also use # a shorter alias to save typing. @@ -36,7 +46,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_local, worker_data_docker) +c['workers'] = workers.gentoo_workers(worker_data) # 'protocols' contains information about protocols which master will use for # communicating with workers. You must define at least 'port' option that workers @@ -65,7 +75,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_local, worker_data_docker) +c['builders'] = builders.gentoo_builders(worker_data) ####### BUILDBOT SERVICES |