From b61c996c305f78063d7e73bb7d1f364713125e67 Mon Sep 17 00:00:00 2001 From: Julien Malka Date: Sat, 28 Jan 2023 00:28:49 +0100 Subject: [PATCH] Little cosmetic changes to buildbot (2) --- modules/buildbot/buildbot_nix.py | 7 ------- modules/buildbot/master.py | 2 +- 2 files changed, 1 insertion(+), 8 deletions(-) diff --git a/modules/buildbot/buildbot_nix.py b/modules/buildbot/buildbot_nix.py index b053cc4..70d221a 100644 --- a/modules/buildbot/buildbot_nix.py +++ b/modules/buildbot/buildbot_nix.py @@ -44,19 +44,12 @@ class BuildTrigger(Trigger): def getSchedulersAndProperties(self): build_props = self.build.getProperties() - repo_name = build_props.getProperty( - "github.base.repo.full_name", - build_props.getProperty("github.repository.full_name"), - ) - sch = self.schedulerNames[0] triggered_schedulers = [] for job in self.jobs: attr = job.get("attr", "eval-error") name = attr - if repo_name is not None: - name = f"{repo_name}: {name}" drv_path = job.get("drvPath") error = job.get("error") out_path = job.get("outputs", {}).get("out") diff --git a/modules/buildbot/master.py b/modules/buildbot/master.py index 0e82e03..d19fcfc 100644 --- a/modules/buildbot/master.py +++ b/modules/buildbot/master.py @@ -99,7 +99,7 @@ def build_config() -> dict[str, Any]: # Since we dynamically create build steps, # we use `virtual_builder_name` in the webinterface # so that we distinguish what has beeing build - context=Interpolate("buildbot/%(prop:virtual_builder_name)s"), + context=Interpolate("%(prop:virtual_builder_name)s"), ), ]