* [PATCH] buildbot: come up with vm_workers variable
@ 2022-05-25 12:55 Martin Liška
2022-05-25 14:46 ` Mark Wielaard
0 siblings, 1 reply; 5+ messages in thread
From: Martin Liška @ 2022-05-25 12:55 UTC (permalink / raw)
To: overseers; +Cc: Mark Wielaard
---
builder/master.cfg | 26 ++++++++++++++------------
1 file changed, 14 insertions(+), 12 deletions(-)
diff --git a/builder/master.cfg b/builder/master.cfg
index b834826..4fabce7 100644
--- a/builder/master.cfg
+++ b/builder/master.cfg
@@ -169,6 +169,8 @@ bb3_worker = worker.DockerLatentWorker("bb3",
properties={'ncpus': 8});
c['workers'].append(bb3_worker)
+vm_workers = ['bb1', 'bb2', 'bb3']
+
# 'protocols' contains information about protocols which master will use for
# communicating with workers. You must define at least 'port' option that workers
# could connect to your master with this protocol.
@@ -659,7 +661,7 @@ bzip2_fedora_x86_64_builder = util.BuilderConfig(
name="bzip2-fedora-x86_64",
properties={'container-file':
readContainerFile('fedora-latest')},
- workernames=["bb1", "bb2", "bb3"],
+ workernames=vm_workers,
tags=["bzip2", "fedora", "x86_64"],
factory=bzip2_factory)
c['builders'].append(bzip2_fedora_x86_64_builder)
@@ -668,7 +670,7 @@ bzip2_debian_amd64_builder = util.BuilderConfig(
name="bzip2-debian-amd64",
properties={'container-file':
readContainerFile('debian-stable')},
- workernames=["bb1", "bb2", "bb3"],
+ workernames=vm_workers,
tags=["bzip2", "debian", "x86_64"],
factory=bzip2_factory_no_valgrind)
c['builders'].append(bzip2_debian_amd64_builder)
@@ -749,7 +751,7 @@ debugedit_fedora_x86_64_builder = util.BuilderConfig(
name="debugedit-fedora-x86_64",
properties={'container-file':
readContainerFile('fedora-latest')},
- workernames=["bb1", "bb2", "bb3"],
+ workernames=vm_workers,
tags=["debugedit", "fedora", "x86_64"],
factory=debugedit_factory)
c['builders'].append(debugedit_fedora_x86_64_builder)
@@ -758,7 +760,7 @@ debugedit_debian_amd64_builder = util.BuilderConfig(
name="debugedit-debian-amd64",
properties={'container-file':
readContainerFile('debian-stable')},
- workernames=["bb1", "bb2", "bb3"],
+ workernames=vm_workers,
tags=["debugedit", "debian", "x86_64"],
factory=debugedit_factory)
c['builders'].append(debugedit_debian_amd64_builder)
@@ -837,7 +839,7 @@ dwz_fedora_x86_64_builder = util.BuilderConfig(
name="dwz-fedora-x86_64",
properties={'container-file':
readContainerFile('fedora-latest')},
- workernames=["bb1", "bb2", "bb3"],
+ workernames=vm_workers,
tags=["dwz", "fedora", "x86_64"],
factory=dwz_factory)
c['builders'].append(dwz_fedora_x86_64_builder)
@@ -846,7 +848,7 @@ dwz_debian_amd64_builder = util.BuilderConfig(
name="dwz-debian-amd64",
properties={'container-file':
readContainerFile('debian-stable')},
- workernames=["bb1", "bb2", "bb3"],
+ workernames=vm_workers,
tags=["dwz", "debian", "x86_64"],
factory=dwz_factory)
c['builders'].append(dwz_debian_amd64_builder)
@@ -1017,7 +1019,7 @@ elfutils_fedora_x86_64_builder = util.BuilderConfig(
name="elfutils-fedora-x86_64",
properties={'container-file':
readContainerFile('fedora-latest')},
- workernames=["bb1", "bb2", "bb3"],
+ workernames=vm_workers,
tags=["elfutils", "fedora", "x86_64"],
factory=elfutils_factory_distcheck)
c['builders'].append(elfutils_fedora_x86_64_builder)
@@ -1026,7 +1028,7 @@ elfutils_debian_amd64_builder = util.BuilderConfig(
name="elfutils-debian-amd64",
properties={'container-file':
readContainerFile('debian-stable')},
- workernames=["bb1", "bb2", "bb3"],
+ workernames=vm_workers,
tags=["elfutils", "debian", "x86_64"],
factory=elfutils_factory_mvu)
c['builders'].append(elfutils_debian_amd64_builder)
@@ -1117,7 +1119,7 @@ gccrust_fedora_x86_64_builder = util.BuilderConfig(
name="gccrust-fedora-x86_64",
properties={'container-file':
readContainerFile('fedora-latest')},
- workernames=["bb1", "bb2", "bb3"],
+ workernames=vm_workers,
tags=["gccrust", "fedora", "x86_64"],
factory=gccrust_factory)
c['builders'].append(gccrust_fedora_x86_64_builder)
@@ -1552,7 +1554,7 @@ libabigail_fedora_x86_64_builder = util.BuilderConfig(
name="libabigail-fedora-x86_64",
properties={'container-file':
readContainerFile('fedora-latest')},
- workernames=["bb1", "bb2", "bb3"],
+ workernames=vm_workers,
tags=["libabigail", "fedora", "x86_64"],
factory=libabigail_factory)
c['builders'].append(libabigail_fedora_x86_64_builder)
@@ -1561,7 +1563,7 @@ libabigail_debian_amd64_builder = util.BuilderConfig(
name="libabigail-debian-amd64",
properties={'container-file':
readContainerFile('debian-stable')},
- workernames=["bb1", "bb2", "bb3"],
+ workernames=vm_workers,
tags=["libabigail", "debian", "x86_64"],
factory=libabigail_factory_checkonly)
c['builders'].append(libabigail_debian_amd64_builder)
@@ -1646,7 +1648,7 @@ valgrind_fedora_x86_64_builder = util.BuilderConfig(
name="valgrind-fedora-x86_64",
properties={'container-file':
readContainerFile('fedora-latest')},
- workernames=["bb1", "bb2", "bb3"],
+ workernames=vm_workers,
tags=["valgrind", "fedora", "x86_64"],
factory=valgrind_dist_aux_factory)
c['builders'].append(valgrind_fedora_x86_64_builder)
--
2.36.1
^ permalink raw reply [flat|nested] 5+ messages in thread* Re: [PATCH] buildbot: come up with vm_workers variable
2022-05-25 12:55 [PATCH] buildbot: come up with vm_workers variable Martin Liška
@ 2022-05-25 14:46 ` Mark Wielaard
2022-05-25 20:00 ` Martin Liška
0 siblings, 1 reply; 5+ messages in thread
From: Mark Wielaard @ 2022-05-25 14:46 UTC (permalink / raw)
To: Overseers mailing list
Hi Martin,
On Wed, 2022-05-25 at 14:55 +0200, Martin Liška via Overseers wrote:
>
> +vm_workers = ['bb1', 'bb2', 'bb3']
> +
Thanks. Applied.
There are probably a lot more python simplifications/cleanups to be
done. I admit I am mostly a python copy/paster...
Cheers,
Mark
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCH] buildbot: come up with vm_workers variable
2022-05-25 14:46 ` Mark Wielaard
@ 2022-05-25 20:00 ` Martin Liška
2022-05-25 21:24 ` Mark Wielaard
0 siblings, 1 reply; 5+ messages in thread
From: Martin Liška @ 2022-05-25 20:00 UTC (permalink / raw)
To: Mark Wielaard, Overseers mailing list
On 5/25/22 16:46, Mark Wielaard wrote:
> Hi Martin,
>
> On Wed, 2022-05-25 at 14:55 +0200, Martin Liška via Overseers wrote:
>>
>> +vm_workers = ['bb1', 'bb2', 'bb3']
>> +
>
> Thanks. Applied.
Thank you.
>
> There are probably a lot more python simplifications/cleanups to be
> done. I admit I am mostly a python copy/paster...
Sure, but overall the buildbot config looks quite nice compared to what I have :)
Btw. can one somehow run the master.cfg validation locally?
Cheers,
Martin
>
> Cheers,
>
> Mark
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCH] buildbot: come up with vm_workers variable
2022-05-25 20:00 ` Martin Liška
@ 2022-05-25 21:24 ` Mark Wielaard
2022-05-26 8:40 ` Martin Liška
0 siblings, 1 reply; 5+ messages in thread
From: Mark Wielaard @ 2022-05-25 21:24 UTC (permalink / raw)
To: Martin Liška; +Cc: Overseers mailing list
Hi Martin,
On Wed, May 25, 2022 at 10:00:09PM +0200, Martin Liška wrote:
> Btw. can one somehow run the master.cfg validation locally?
Yes! And it is even documented in the README:
= Local hacking
buildbot runs in a python virtual environment that can be replicated
locally:
- python3 -m venv buildbot-env
- source buildbot-env/bin/activate
- python3 -m pip install -r buildbot.requirements
[ ... ]
Create a local buildbot-master:
- buildbot create-master builder
You will also need a ~/buildbot.config file which contains the
passwords for workers and users. You can use the
buildbot.config.sample file for that. DO NOT USE AS IS! Change the
password 'frob' to something real so local users and workers cannot
connect to your local buildbot (if there are other local users and/or
no firewall).
Now after changing master.cfg you can run:
- buildbot checkconfig builder
Cheers,
Mark
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCH] buildbot: come up with vm_workers variable
2022-05-25 21:24 ` Mark Wielaard
@ 2022-05-26 8:40 ` Martin Liška
0 siblings, 0 replies; 5+ messages in thread
From: Martin Liška @ 2022-05-26 8:40 UTC (permalink / raw)
To: Mark Wielaard; +Cc: Overseers mailing list
On 5/25/22 23:24, Mark Wielaard wrote:
> Hi Martin,
>
> On Wed, May 25, 2022 at 10:00:09PM +0200, Martin Liška wrote:
>> Btw. can one somehow run the master.cfg validation locally?
>
> Yes! And it is even documented in the README:
>
> = Local hacking
>
> buildbot runs in a python virtual environment that can be replicated
> locally:
>
> - python3 -m venv buildbot-env
> - source buildbot-env/bin/activate
> - python3 -m pip install -r buildbot.requirements
>
> [ ... ]
>
> Create a local buildbot-master:
>
> - buildbot create-master builder
>
> You will also need a ~/buildbot.config file which contains the
> passwords for workers and users. You can use the
> buildbot.config.sample file for that. DO NOT USE AS IS! Change the
> password 'frob' to something real so local users and workers cannot
> connect to your local buildbot (if there are other local users and/or
> no firewall).
>
> Now after changing master.cfg you can run:
>
> - buildbot checkconfig builder
Works for me, thanks for sharing the knowledge.
Cheers,
Martin
>
> Cheers,
>
> Mark
>
^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2022-05-26 8:40 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2022-05-25 12:55 [PATCH] buildbot: come up with vm_workers variable Martin Liška
2022-05-25 14:46 ` Mark Wielaard
2022-05-25 20:00 ` Martin Liška
2022-05-25 21:24 ` Mark Wielaard
2022-05-26 8:40 ` Martin Liška
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).