auxolotl/buildbot-nix
26
1
Fork 0
Code Issues Pull requests 1 Actions Packages Projects Releases Wiki Activity

buildbot-nix: limit evaluation to one job per worker

Browse source
This commit is contained in:
Jörg Thalheim 2023-11-10 14:30:09 +01:00
parent 2a565a8d5a
commit 524c8fd150
1 changed files with 6 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
buildbot_nix/__init__.py
View file

@ -412,6 +412,7 @@ def nix_eval_config(
worker_names: list[str], worker_names: list[str],
github_token_secret: str, github_token_secret: str,
supported_systems: list[str], supported_systems: list[str],
eval_lock: util.WorkerLock,
max_memory_size: int = 4096, max_memory_size: int = 4096,
) -> util.BuilderConfig: ) -> util.BuilderConfig:
""" """
@ -454,6 +455,7 @@ def nix_eval_config(
".#checks", ".#checks",
], ],
haltOnFailure=True, haltOnFailure=True,
locks=[eval_lock.access("counting")],
) )
) )
@ -585,6 +587,7 @@ def config_for_project(
github: GithubConfig, github: GithubConfig,
nix_supported_systems: list[str], nix_supported_systems: list[str],
nix_eval_max_memory_size: int, nix_eval_max_memory_size: int,
eval_lock: util.WorkerLock,
outputs_path: Path | None = None, outputs_path: Path | None = None,
) -> Project: ) -> Project:
## get a deterministic jitter for the project ## get a deterministic jitter for the project
@ -676,6 +679,7 @@ def config_for_project(
github_token_secret=github.token_secret_name, github_token_secret=github.token_secret_name,
supported_systems=nix_supported_systems, supported_systems=nix_supported_systems,
max_memory_size=nix_eval_max_memory_size, max_memory_size=nix_eval_max_memory_size,
eval_lock=eval_lock,
), ),
nix_build_config( nix_build_config(
project, project,
@ -739,6 +743,7 @@ class NixConfigurator(ConfiguratorBase):
worker_names.append(worker_name) worker_names.append(worker_name)
webhook_secret = read_secret_file(self.github.webhook_secret_name) webhook_secret = read_secret_file(self.github.webhook_secret_name)
eval_lock = util.WorkerLock("nix-eval", maxCount=1)
for project in projects: for project in projects:
create_project_hook( create_project_hook(
@ -758,6 +763,7 @@ class NixConfigurator(ConfiguratorBase):
self.github, self.github,
self.nix_supported_systems, self.nix_supported_systems,
self.nix_eval_max_memory_size, self.nix_eval_max_memory_size,
eval_lock,
self.outputs_path, self.outputs_path,
) )