Merge pull request #484 from nix-community/fix-reporting

Make github/gitea ci statuses appear earlier for eval and add statuses for deployment

Author: Mic92

buildbot_nix/buildbot_nix/__init__.py

@@ -100,6 +100,21 @@ def __init__(
             **kwargs,
         )
 
+    async def run(self) -> int:  # type: ignore[override]
+        if self.build and self.master:
+            await CombinedBuildEvent.produce_event_for_build(
+                self.master, CombinedBuildEvent.STARTED_NIX_EFFECTS, self.build, None
+            )
+
+        results = await super().run()
+
+        if self.build and self.master:
+            await CombinedBuildEvent.produce_event_for_build(
+                self.master, CombinedBuildEvent.FINISHED_NIX_EFFECTS, self.build, None
+            )
+
+        return results
+
     def createTriggerProperties(self, props: Any) -> Any:  # noqa: N802
         return props
 
@@ -161,12 +176,11 @@ async def produce_event(self, event: str, result: None | int) -> None:
         )
         if result is not None:
             build["results"] = result
-        self.master.mq.produce(
-            ("builds", str(self.build.buildid), event), copy.deepcopy(build)
-        )
+        event_key = ("builds", str(self.build.buildid), event)
+        self.master.mq.produce(event_key, copy.deepcopy(build))
 
     async def run(self) -> int:
-        await self.produce_event("started-nix-eval", None)
+        await self.produce_event(CombinedBuildEvent.STARTED_NIX_EVAL.value, None)
 
         branch_config: BranchConfig = await BranchConfig.extract_during_step(self)
 

buildbot_nix/buildbot_nix/nix_status_generator.py

@@ -29,6 +29,8 @@ class CombinedBuildEvent(Enum):
     FINISHED_NIX_EVAL = "finished-nix-eval"
     STARTED_NIX_BUILD = "started-nix-build"
     FINISHED_NIX_BUILD = "finished-nix-build"
+    STARTED_NIX_EFFECTS = "started-nix-effects"
+    FINISHED_NIX_EFFECTS = "finished-nix-effects"
 
     @staticmethod
     async def produce_event_for_build_requests_by_id(
@@ -70,26 +72,26 @@ async def produce_event_for_build(
             build_db: Any = await master.data.get(("builds", str(build.buildid)))
             if result is not None:
                 build_db["results"] = result
-            master.mq.produce(
-                ("builds", str(build.buildid), event.name), copy.deepcopy(build_db)
-            )
+            event_key = ("builds", str(build.buildid), event.value)
+            master.mq.produce(event_key, copy.deepcopy(build_db))
         elif isinstance(build, dict):
             if result is not None:
                 build["results"] = result
-            master.mq.produce(
-                ("builds", str(build["buildid"]), event.name), copy.deepcopy(build)
-            )
+            event_key = ("builds", str(build["buildid"]), event.value)
+            master.mq.produce(event_key, copy.deepcopy(build))
 
 
 @implementer(IReportGenerator)
 class BuildNixEvalStatusGenerator(BuildStatusGeneratorMixin):
     wanted_event_keys: ClassVar[list[Any]] = [
-        ("builds", None, str(CombinedBuildEvent.STARTED_NIX_EVAL.name)),
-        ("builds", None, str(CombinedBuildEvent.FINISHED_NIX_EVAL.name)),
-        ("builds", None, str(CombinedBuildEvent.STARTED_NIX_BUILD.name)),
-        ("builds", None, str(CombinedBuildEvent.FINISHED_NIX_BUILD.name)),
-        ("buildrequests", None, str(CombinedBuildEvent.STARTED_NIX_BUILD.name)),
-        ("buildrequests", None, str(CombinedBuildEvent.FINISHED_NIX_BUILD.name)),
+        ("builds", None, CombinedBuildEvent.STARTED_NIX_EVAL.value),
+        ("builds", None, CombinedBuildEvent.FINISHED_NIX_EVAL.value),
+        ("builds", None, CombinedBuildEvent.STARTED_NIX_BUILD.value),
+        ("builds", None, CombinedBuildEvent.FINISHED_NIX_BUILD.value),
+        ("builds", None, CombinedBuildEvent.STARTED_NIX_EFFECTS.value),
+        ("builds", None, CombinedBuildEvent.FINISHED_NIX_EFFECTS.value),
+        ("buildrequests", None, CombinedBuildEvent.STARTED_NIX_BUILD.value),
+        ("buildrequests", None, CombinedBuildEvent.FINISHED_NIX_BUILD.value),
     ]
 
     compare_attrs: ClassVar[list[str]] = ["start_formatter", "end_formatter"]
@@ -181,9 +183,14 @@ async def generate(
     ) -> None | dict[str, Any]:
         what, _, event = key
         if what == "builds":
-            is_new = event == "new"
+            # Check if this is a start event
+            is_start_event = event in [
+                CombinedBuildEvent.STARTED_NIX_EVAL.value,
+                CombinedBuildEvent.STARTED_NIX_BUILD.value,
+                CombinedBuildEvent.STARTED_NIX_EFFECTS.value,
+            ]
 
-            formatter = self.start_formatter if is_new else self.end_formatter
+            formatter = self.start_formatter if is_start_event else self.end_formatter
 
             await getDetailsForBuild(
                 master,
@@ -200,9 +207,8 @@ async def generate(
             report: dict[str, Any] = await self.build_message(
                 formatter, master, reporter, data
             )
-
-            event_typed: CombinedBuildEvent = CombinedBuildEvent.__members__[event]
-            match event_typed:
+            event_type = CombinedBuildEvent(event)
+            match event_type:
                 case (
                     CombinedBuildEvent.STARTED_NIX_EVAL
                     | CombinedBuildEvent.FINISHED_NIX_EVAL
@@ -223,14 +229,23 @@ async def generate(
                             "nix-build",
                             "generator",
                         )
+                case (
+                    CombinedBuildEvent.STARTED_NIX_EFFECTS
+                    | CombinedBuildEvent.FINISHED_NIX_EFFECTS
+                ):
+                    report["builds"][0]["properties"]["status_name"] = (
+                        "nix-effects",
+                        "generator",
+                    )
                 case _:
-                    msg = f"Unexpected event: {event_typed}"
+                    msg = f"Unexpected event: {event_type}"
                     raise ValueError(msg)
 
-            match event_typed:
+            match event_type:
                 case (
                     CombinedBuildEvent.FINISHED_NIX_EVAL
                     | CombinedBuildEvent.FINISHED_NIX_BUILD
+                    | CombinedBuildEvent.FINISHED_NIX_EFFECTS
                 ):
                     report["builds"][0]["complete"] = True
                     report["builds"][0]["complete_at"] = datetime.now(tz=UTC)