NeedToRelease, ParallelBarrier memory, reorganize code

Author: Peter-Sh

config.yaml

@@ -56,8 +56,10 @@ packages:
     package_type: snap
     repo: redislabsdev/redis-snap
     # homebrew has one fixed release branch: main
-    ref: master
+    #ref: master
+    ref: release_automation
     build_workflow: release_build_and_test.yml
+    build_timeout_minutes: 60
     build_inputs: {}
     publish_internal_release: yes
     publish_workflow: release_publish.yml

src/redis_release/bht/behaviours_debian.py

@@ -0,0 +1,25 @@
+from py_trees.common import Status
+
+from redis_release.bht.behaviours import LoggingAction
+from redis_release.bht.state import PackageMeta, ReleaseMeta
+
+# Conditions
+
+
+class NeedToReleaseDebian(LoggingAction):
+    """Check if Debian package needs to be released."""
+
+    def __init__(
+        self,
+        name: str,
+        package_meta: PackageMeta,
+        release_meta: ReleaseMeta,
+        log_prefix: str = "",
+    ) -> None:
+        self.package_meta = package_meta
+        self.release_meta = release_meta
+        super().__init__(name=name, log_prefix=log_prefix)
+
+    def update(self) -> Status:
+        # Debian packages are always released
+        return Status.SUCCESS

src/redis_release/bht/behaviours_docker.py

@@ -1,6 +1,6 @@
 from py_trees.common import Status
 
-from redis_release.bht.behaviours import ReleaseAction
+from redis_release.bht.behaviours import LoggingAction, ReleaseAction
 from redis_release.bht.state import PackageMeta, ReleaseMeta, Workflow
 
 
@@ -24,3 +24,25 @@ def __init__(
 
     def update(self) -> Status:
         return Status.SUCCESS
+
+
+# Conditions
+
+
+class NeedToReleaseDocker(LoggingAction):
+    """Check if Docker package needs to be released."""
+
+    def __init__(
+        self,
+        name: str,
+        package_meta: PackageMeta,
+        release_meta: ReleaseMeta,
+        log_prefix: str = "",
+    ) -> None:
+        self.package_meta = package_meta
+        self.release_meta = release_meta
+        super().__init__(name=name, log_prefix=log_prefix)
+
+    def update(self) -> Status:
+        # Docker packages are always released
+        return Status.SUCCESS

src/redis_release/bht/behaviours_homebrew.py

@@ -10,24 +10,6 @@
 from redis_release.models import HomebrewChannel, RedisVersion, ReleaseType
 
 
-class NeedToReleaseHomebrew(LoggingAction):
-    def __init__(
-        self,
-        name: str,
-        package_meta: HomebrewMeta,
-        release_meta: ReleaseMeta,
-        log_prefix: str = "",
-    ) -> None:
-        self.package_meta = package_meta
-        self.release_meta = release_meta
-        super().__init__(name=name, log_prefix=log_prefix)
-
-    def update(self) -> Status:
-        if self.package_meta.ephemeral.is_version_acceptable is True:
-            return Status.SUCCESS
-        return Status.FAILURE
-
-
 class HomewbrewWorkflowInputs(ReleaseAction):
     def __init__(
         self,
@@ -271,3 +253,24 @@ def update(self) -> Status:
 
         except Exception as e:
             return self.log_exception_and_return_failure(e)
+
+
+# Conditions
+
+
+class NeedToReleaseHomebrew(LoggingAction):
+    def __init__(
+        self,
+        name: str,
+        package_meta: HomebrewMeta,
+        release_meta: ReleaseMeta,
+        log_prefix: str = "",
+    ) -> None:
+        self.package_meta = package_meta
+        self.release_meta = release_meta
+        super().__init__(name=name, log_prefix=log_prefix)
+
+    def update(self) -> Status:
+        if self.package_meta.ephemeral.is_version_acceptable is True:
+            return Status.SUCCESS
+        return Status.FAILURE

src/redis_release/bht/behaviours_rpm.py

@@ -0,0 +1,25 @@
+from py_trees.common import Status
+
+from redis_release.bht.behaviours import LoggingAction
+from redis_release.bht.state import PackageMeta, ReleaseMeta
+
+# Conditions
+
+
+class NeedToReleaseRPM(LoggingAction):
+    """Check if RPM package needs to be released."""
+
+    def __init__(
+        self,
+        name: str,
+        package_meta: PackageMeta,
+        release_meta: ReleaseMeta,
+        log_prefix: str = "",
+    ) -> None:
+        self.package_meta = package_meta
+        self.release_meta = release_meta
+        super().__init__(name=name, log_prefix=log_prefix)
+
+    def update(self) -> Status:
+        # RPM packages are always released
+        return Status.SUCCESS

src/redis_release/bht/composites.py

@@ -61,8 +61,10 @@ class ParallelBarrier(Composite):
     def __init__(
         self,
         name: str,
+        memory: bool = True,
         children: Optional[TypingSequence[Behaviour]] = None,
     ):
+        self.memory = memory
         super().__init__(name, children)
 
     def tick(self) -> Iterator[Behaviour]:
@@ -84,7 +86,7 @@ def tick(self) -> Iterator[Behaviour]:
         # Tick all children, skipping those that have already converged
         for child in self.children:
             # Skip children that have already converged (synchronized mode)
-            if child.status in [Status.SUCCESS, Status.FAILURE]:
+            if self.memory and child.status in [Status.SUCCESS, Status.FAILURE]:
                 continue
             # Tick the child
             for node in child.tick():

src/redis_release/bht/tree_factory_debian.py

@@ -1,5 +1,18 @@
+from py_trees.behaviour import Behaviour
+
+from redis_release.bht.behaviours_debian import NeedToReleaseDebian
+from redis_release.bht.state import PackageMeta, ReleaseMeta
 from redis_release.bht.tree_factory_generic import GenericPackageFactory
 
 
 class DebianFactory(GenericPackageFactory):
-    pass
+    def create_need_to_release_behaviour(
+        self,
+        name: str,
+        package_meta: PackageMeta,
+        release_meta: ReleaseMeta,
+        log_prefix: str,
+    ) -> Behaviour:
+        return NeedToReleaseDebian(
+            name, package_meta, release_meta, log_prefix=log_prefix
+        )

src/redis_release/bht/tree_factory_docker.py

@@ -1,6 +1,9 @@
 from py_trees.behaviour import Behaviour
 
-from redis_release.bht.behaviours_docker import DockerWorkflowInputs
+from redis_release.bht.behaviours_docker import (
+    DockerWorkflowInputs,
+    NeedToReleaseDocker,
+)
 from redis_release.bht.state import PackageMeta, ReleaseMeta, Workflow
 from redis_release.bht.tree_factory_generic import GenericPackageFactory
 
@@ -31,3 +34,14 @@ def create_publish_workflow_inputs(
         return DockerWorkflowInputs(
             name, workflow, package_meta, release_meta, log_prefix=log_prefix
         )
+
+    def create_need_to_release_behaviour(
+        self,
+        name: str,
+        package_meta: PackageMeta,
+        release_meta: ReleaseMeta,
+        log_prefix: str,
+    ) -> Behaviour:
+        return NeedToReleaseDocker(
+            name, package_meta, release_meta, log_prefix=log_prefix
+        )

src/redis_release/bht/tree_factory_generic.py

@@ -3,6 +3,7 @@
 
 from py_trees.behaviour import Behaviour
 from py_trees.behaviours import Failure as AlwaysFailure
+from py_trees.behaviours import Success as AlwaysSuccess
 from py_trees.composites import Selector, Sequence
 from py_trees.decorators import Inverter
 
@@ -45,7 +46,7 @@ def create_package_release_goal_tree_branch(
         return Selector(
             f"Package Release {package_name} Goal",
             memory=False,
-            children=[AlwaysFailure("Yes"), package_release],
+            children=[AlwaysFailure("Always"), package_release],
         )
 
     def create_build_workflow_inputs(
@@ -327,6 +328,20 @@ def create_extract_result_tree_branch(
         latch_chains(extract_artifact_result, download_artifacts)
         return extract_artifact_result
 
+    def create_need_to_release_behaviour(
+        self,
+        name: str,
+        package_meta: PackageMeta,
+        release_meta: ReleaseMeta,
+        log_prefix: str,
+    ) -> Behaviour:
+        """Create a behaviour that checks if the package needs to be released.
+
+        Default implementation always returns SUCCESS (always release).
+        Override in subclasses for package-specific logic.
+        """
+        return AlwaysSuccess(name)
+
 
 class PackageWithValidation:
     """

src/redis_release/bht/tree_factory_protocol.py

@@ -95,3 +95,11 @@ def create_extract_result_tree_branch(
         github_client: GitHubClientAsync,
         log_prefix: str,
     ) -> Union[Selector, Sequence]: ...
+
+    def create_need_to_release_behaviour(
+        self,
+        name: str,
+        package_meta: PackageMeta,
+        release_meta: ReleaseMeta,
+        log_prefix: str,
+    ) -> Behaviour: ...