wip: dependency-tracked build triggering
This commit is contained in:
parent
a6fae8d3a0
commit
544a492000
|
@ -60,11 +60,13 @@ class BuildTrigger(Trigger):
|
||||||
builds_scheduler: str,
|
builds_scheduler: str,
|
||||||
skipped_builds_scheduler: str,
|
skipped_builds_scheduler: str,
|
||||||
jobs: list[dict[str, Any]],
|
jobs: list[dict[str, Any]],
|
||||||
|
drv_info: dict[str, Any],
|
||||||
**kwargs: Any,
|
**kwargs: Any,
|
||||||
) -> None:
|
) -> None:
|
||||||
if "name" not in kwargs:
|
if "name" not in kwargs:
|
||||||
kwargs["name"] = "trigger"
|
kwargs["name"] = "trigger"
|
||||||
self.jobs = jobs
|
self.jobs = jobs
|
||||||
|
self.drv_info = drv_info
|
||||||
self.config = None
|
self.config = None
|
||||||
self.builds_scheduler = builds_scheduler
|
self.builds_scheduler = builds_scheduler
|
||||||
self.skipped_builds_scheduler = skipped_builds_scheduler
|
self.skipped_builds_scheduler = skipped_builds_scheduler
|
||||||
|
@ -87,6 +89,25 @@ class BuildTrigger(Trigger):
|
||||||
build_props = self.build.getProperties()
|
build_props = self.build.getProperties()
|
||||||
source = f"nix-eval-lix"
|
source = f"nix-eval-lix"
|
||||||
|
|
||||||
|
all_deps = dict()
|
||||||
|
for drv, info in self.drv_info.items():
|
||||||
|
all_deps[drv] = set(info.get("inputDrvs").keys())
|
||||||
|
def closure_of(key, deps):
|
||||||
|
r = set()
|
||||||
|
r.add(key)
|
||||||
|
while True:
|
||||||
|
more = set(r)
|
||||||
|
more.update(*( deps[k] for k in r ))
|
||||||
|
if r == more:
|
||||||
|
break
|
||||||
|
r = more
|
||||||
|
r.remove(key)
|
||||||
|
return r
|
||||||
|
job_set = set(( drv for drv in ( job.get("drvPath") for job in self.jobs ) if drv ))
|
||||||
|
all_deps = { k: list(closure_of(k, all_deps).intersection(job_set)) for k in job_set }
|
||||||
|
|
||||||
|
build_props.setProperty("sched_state", all_deps, source, True)
|
||||||
|
|
||||||
triggered_schedulers = []
|
triggered_schedulers = []
|
||||||
for job in self.jobs:
|
for job in self.jobs:
|
||||||
attr = job.get("attr", "eval-error")
|
attr = job.get("attr", "eval-error")
|
||||||
|
@ -178,6 +199,24 @@ class NixEvalCommand(buildstep.ShellMixin, steps.BuildStep):
|
||||||
if not system or system in self.supported_systems: # report eval errors
|
if not system or system in self.supported_systems: # report eval errors
|
||||||
filtered_jobs.append(job)
|
filtered_jobs.append(job)
|
||||||
|
|
||||||
|
drv_show_log: Log = yield self.getLog("stdio")
|
||||||
|
drv_show_log.addStdout(f"getting derivation infos\n")
|
||||||
|
cmd = yield self.makeRemoteShellCommand(
|
||||||
|
stdioLogName=None,
|
||||||
|
collectStdout=True,
|
||||||
|
command=(
|
||||||
|
["nix", "derivation", "show", "--recursive"]
|
||||||
|
+ [ drv for drv in (job.get("drvPath") for job in filtered_jobs) if drv ]
|
||||||
|
),
|
||||||
|
)
|
||||||
|
yield self.runCommand(cmd)
|
||||||
|
drv_show_log.addStdout(f"done\n")
|
||||||
|
try:
|
||||||
|
drv_info = json.loads(cmd.stdout)
|
||||||
|
except json.JSONDecodeError as e:
|
||||||
|
msg = f"Failed to parse `nix derivation show` output for {cmd.command}"
|
||||||
|
raise BuildbotNixError(msg) from e
|
||||||
|
|
||||||
self.build.addStepsAfterCurrentStep(
|
self.build.addStepsAfterCurrentStep(
|
||||||
[
|
[
|
||||||
BuildTrigger(
|
BuildTrigger(
|
||||||
|
@ -185,6 +224,7 @@ class NixEvalCommand(buildstep.ShellMixin, steps.BuildStep):
|
||||||
skipped_builds_scheduler=f"lix-nix-skipped-build",
|
skipped_builds_scheduler=f"lix-nix-skipped-build",
|
||||||
name="build flake",
|
name="build flake",
|
||||||
jobs=filtered_jobs,
|
jobs=filtered_jobs,
|
||||||
|
drv_info=drv_info,
|
||||||
),
|
),
|
||||||
],
|
],
|
||||||
)
|
)
|
||||||
|
|
Loading…
Reference in a new issue