Merge pull request #281 from MagicRB/fix-lacking-step-names

Fix missing information in build names

Author: Mic92

buildbot_nix/__init__.py

@@ -70,6 +70,7 @@ class BuildbotNixError(Exception):
 class BuildTrigger(buildstep.ShellMixin, steps.BuildStep):
     """Dynamic trigger that creates a build for every attribute."""
 
+    project: GitProject
     successful_jobs: list[NixEvalJobSuccess]
     failed_jobs: list[NixEvalJobError]
     combined_build: bool
@@ -108,6 +109,7 @@ def __iter__(self) -> Generator[Any, None, None]:
 
     def __init__(
         self,
+        project: GitProject,
         builds_scheduler: str,
         skipped_builds_scheduler: str,
         failed_eval_scheduler: str,
@@ -118,6 +120,7 @@ def __init__(
         combine_builds: bool,
         **kwargs: Any,
     ) -> None:
+        self.project = project
         self.successful_jobs = successful_jobs
         self.failed_jobs = failed_jobs
         self.combine_builds = combine_builds
@@ -167,11 +170,13 @@ def get_scheduler_by_name(self, name: str) -> BaseScheduler:
     @staticmethod
     def set_common_properties(
         props: Properties,
+        project: Project,
         source: str,
         job: NixEvalJob,
     ) -> Properties:
-        props.setProperty("virtual_builder_name", f".#checks.{job.attr}", source)
-        props.setProperty("status_name", f"nix-build .#checks.{job.attr}", source)
+        name = f"{project.nix_ref_type}:{project.name}#checks.{job.attr}"
+        props.setProperty("virtual_builder_name", name, source)
+        props.setProperty("status_name", f"nix-build {name}", source)
         props.setProperty("virtual_builder_tags", "", source)
         props.setProperty("attr", job.attr, source)
 
@@ -180,7 +185,9 @@ def set_common_properties(
     def schedule_eval_failure(self, job: NixEvalJobError) -> tuple[str, Properties]:
         source = "nix-eval-nix"
 
-        props = BuildTrigger.set_common_properties(Properties(), source, job)
+        props = BuildTrigger.set_common_properties(
+            Properties(), self.project, source, job
+        )
         props.setProperty("error", job.error, source)
 
         return (self.failed_eval_scheduler, props)
@@ -190,7 +197,9 @@ def schedule_cached_failure(
     ) -> tuple[str, Properties]:
         source = "nix-eval-nix"
 
-        props = BuildTrigger.set_common_properties(Properties(), source, job)
+        props = BuildTrigger.set_common_properties(
+            Properties(), self.project, source, job
+        )
         props.setProperty("first_failure", str(first_failure), source)
 
         return (self.cached_failure_scheduler, props)
@@ -202,7 +211,9 @@ def schedule_dependency_failed(
     ) -> tuple[str, Properties]:
         source = "nix-eval-nix"
 
-        props = BuildTrigger.set_common_properties(Properties(), source, job)
+        props = BuildTrigger.set_common_properties(
+            Properties(), self.project, source, job
+        )
         props.setProperty("dependency.attr", dependency.attr, source)
 
         return (self.dependency_failed_scheduler, props)
@@ -218,7 +229,9 @@ def schedule_success(
         system = job.system
         out_path = job.outputs["out"] or None
 
-        props = BuildTrigger.set_common_properties(Properties(), source, job)
+        props = BuildTrigger.set_common_properties(
+            Properties(), self.project, source, job
+        )
         props.setProperty("system", system, source)
         props.setProperty("drv_path", drv_path, source)
         props.setProperty("out_path", out_path, source)
@@ -659,6 +672,7 @@ def run(self) -> Generator[Any, object, Any]:
             self.build.addStepsAfterCurrentStep(
                 [
                     BuildTrigger(
+                        project=self.project,
                         builds_scheduler=f"{self.project.project_id}-nix-build",
                         skipped_builds_scheduler=f"{self.project.project_id}-nix-skipped-build",
                         failed_eval_scheduler=f"{self.project.project_id}-nix-failed-eval",

buildbot_nix/gitea_projects.py

@@ -70,6 +70,10 @@ def pretty_type(self) -> str:
     def type(self) -> str:
         return "gitea"
 
+    @property
+    def nix_ref_type(self) -> str:
+        return "gitea"
+
     @property
     def repo(self) -> str:
         return self.data.name

buildbot_nix/github_projects.py

@@ -743,6 +743,10 @@ def url(self) -> str:
     def project_id(self) -> str:
         return slugify_project_name(self.data.full_name)
 
+    @property
+    def nix_ref_type(self) -> str:
+        return "github"
+
     @property
     def default_branch(self) -> str:
         return self.data.default_branch

buildbot_nix/projects.py

@@ -81,6 +81,11 @@ def type(self) -> str:
     def repo(self) -> str:
         pass
 
+    @property
+    @abstractmethod
+    def nix_ref_type(self) -> str:
+        pass
+
     @property
     @abstractmethod
     def owner(self) -> str: