lix-project/buildbot-nix
15
0
Fork 0
Code Issues 13 Pull requests 7 Packages Projects Releases Wiki Activity

use .#hydraJobs rather than .#checks

Browse source
This commit is contained in:
puck 2024-03-08 23:28:49 +00:00
parent c487ada514
commit ec2ef903ab
1 changed files with 12 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
buildbot_nix/__init__.py
View file

@ -91,11 +91,11 @@ class BuildTrigger(Trigger):
for job in self.jobs:
attr = job.get("attr", "eval-error")
name = attr
name = f"checks.{name}"
name = f"hydraJobs.{name}"
error = job.get("error")
props = Properties()
props.setProperty("virtual_builder_name", name, source)
props.setProperty("status_name", f"nix-build .#checks.{attr}", source)
props.setProperty("status_name", f"nix-build .#hydraJobs.{attr}", source)
props.setProperty("virtual_builder_tags", "", source)
if error is not None:
@ -153,7 +153,7 @@ class NixEvalCommand(buildstep.ShellMixin, steps.BuildStep):
@defer.inlineCallbacks
def run(self) -> Generator[Any, object, Any]:
# run nix-eval-jobs --flake .#checks to generate the dict of stages
# run nix-eval-jobs --flake .#hydraJobs to generate the dict of stages
cmd: remotecommand.RemoteCommand = yield self.makeRemoteShellCommand()
yield self.runCommand(cmd)
@ -341,7 +341,7 @@ def nix_eval_config(
"--force-recurse",
"--check-cache-status",
"--flake",
".#checks",
".#hydraJobs",
],
haltOnFailure=True,
locks=[eval_lock.access("exclusive")],
@ -614,16 +614,20 @@ def gerritReviewCB(builderName, build, result, master, arg):
continue
for url in step['urls']:
if url['name'].startswith('success: checks.'):
if url['name'].startswith('success: hydraJobs.'):
path = url['name'].split(' ')[1]
all_checks[path] = (True, url['url'])
elif url['name'].startswith('failure: checks.'):
elif url['name'].startswith('failure: hydraJobs.'):
path = url['name'].split(' ')[1]
all_checks[path] = (False, url['url'])
collected_oses = {}
for check in all_checks:
arch = check.split('.')[1]
arch = check.split('.')[-1]
if not arch.endswith('-linux') and not arch.endswith('-darwin'):
# Not an architecture-specific job, just a test
os = "test"
else:
os = arch.split('-')[1]
(success, failure) = collected_oses.get(os, (0, 0))
if all_checks[check][0]: