nix/coordinator: hardcode remaining github properties to lix
Signed-off-by: Raito Bezarius <raito@lix.systems>
This commit is contained in:
parent
3895b90493
commit
2bcc0ee4e9
|
@ -85,21 +85,13 @@ class BuildTrigger(Trigger):
|
|||
|
||||
def getSchedulersAndProperties(self) -> list[tuple[str, Properties]]: # noqa: N802
|
||||
build_props = self.build.getProperties()
|
||||
repo_name = build_props.getProperty(
|
||||
"github.base.repo.full_name",
|
||||
build_props.getProperty("github.repository.full_name"),
|
||||
)
|
||||
project_id = slugify_project_name(repo_name)
|
||||
source = f"nix-eval-{project_id}"
|
||||
source = f"nix-eval-lix"
|
||||
|
||||
triggered_schedulers = []
|
||||
for job in self.jobs:
|
||||
attr = job.get("attr", "eval-error")
|
||||
name = attr
|
||||
if repo_name is not None:
|
||||
name = f"github:{repo_name}#checks.{name}"
|
||||
else:
|
||||
name = f"checks.{name}"
|
||||
name = f"checks.{name}"
|
||||
error = job.get("error")
|
||||
props = Properties()
|
||||
props.setProperty("virtual_builder_name", name, source)
|
||||
|
@ -180,11 +172,6 @@ class NixEvalCommand(buildstep.ShellMixin, steps.BuildStep):
|
|||
raise BuildbotNixError(msg) from e
|
||||
jobs.append(job)
|
||||
build_props = self.build.getProperties()
|
||||
repo_name = build_props.getProperty(
|
||||
"github.base.repo.full_name",
|
||||
build_props.getProperty("github.repository.full_name"),
|
||||
)
|
||||
project_id = slugify_project_name(repo_name)
|
||||
filtered_jobs = []
|
||||
for job in jobs:
|
||||
system = job.get("system")
|
||||
|
@ -194,8 +181,8 @@ class NixEvalCommand(buildstep.ShellMixin, steps.BuildStep):
|
|||
self.build.addStepsAfterCurrentStep(
|
||||
[
|
||||
BuildTrigger(
|
||||
builds_scheduler=f"{project_id}-nix-build",
|
||||
skipped_builds_scheduler=f"{project_id}-nix-skipped-build",
|
||||
builds_scheduler=f"lix-nix-build",
|
||||
skipped_builds_scheduler=f"lix-nix-skipped-build",
|
||||
name="build flake",
|
||||
jobs=filtered_jobs,
|
||||
),
|
||||
|
|
Loading…
Reference in a new issue