RPM factory, rewire WorkflowInput classes

Author: Peter-Sh

config.yaml

@@ -1,7 +1,7 @@
 version: 1
 packages:
   docker:
-    # available types: docker, debian
+    # available types: docker, debian, homebrew
     package_type: docker
     # repo where the workflow is started
     repo: redis/docker-library-redis
@@ -33,11 +33,22 @@ packages:
     publish_timeout_minutes: 10
     publish_inputs: {}
   rpm:
-    package_type: debian
+    package_type: rpm
     repo: redis/redis-rpm
     build_workflow: release_build_and_test.yml
     build_inputs: {}
     publish_internal_release: yes
     publish_workflow: release_publish.yml
     publish_timeout_minutes: 10
     publish_inputs: {}
+  homebrew:
+    package_type: homebrew
+    repo: redis/homebrew-redis
+    # homebrew has one fixed release branch: main
+    ref: main
+    build_workflow: release_build_and_test.yml
+    build_inputs: {}
+    publish_internal_release: yes
+    publish_workflow: release_publish.yml
+    publish_timeout_minutes: 10
+    publish_inputs: {}

src/redis_release/bht/behaviours.py

@@ -711,13 +711,21 @@ def __init__(
         self.workflow = workflow
         self.package_meta = package_meta
         self.release_meta = release_meta
-        super().__init__(name=name, log_prefix=log_prefix)
+        super().__init__(name=f"{name} - debian", log_prefix=log_prefix)
 
     def update(self) -> Status:
+        if self.package_meta.release_type is not None:
+            self.workflow.inputs["release_type"] = self.package_meta.release_type.value
+        if self.release_meta.tag is not None:
+            self.workflow.inputs["release_tag"] = self.release_meta.tag
         return Status.SUCCESS
 
 
-class DebianWorkflowInputs(ReleaseAction):
+class DockerWorkflowInputs(ReleaseAction):
+    """
+    Docker uses only release_tag input which is set automatically in TriggerWorkflow
+    """
+
     def __init__(
         self,
         name: str,
@@ -729,13 +737,9 @@ def __init__(
         self.workflow = workflow
         self.package_meta = package_meta
         self.release_meta = release_meta
-        super().__init__(name=f"{name} - debian", log_prefix=log_prefix)
+        super().__init__(name=name, log_prefix=log_prefix)
 
     def update(self) -> Status:
-        if self.package_meta.release_type is not None:
-            self.workflow.inputs["release_type"] = self.package_meta.release_type.value
-        if self.release_meta.tag is not None:
-            self.workflow.inputs["release_tag"] = self.release_meta.tag
         return Status.SUCCESS
 
 

src/redis_release/bht/tree_factory.py

@@ -15,9 +15,8 @@
 from ..models import PackageType
 from .backchain import create_PPA, latch_chains
 from .behaviours import (
-    ClassifyHomebrewVersion,
-    DebianWorkflowInputs,
     DetectHombrewReleaseAndChannel,
+    DockerWorkflowInputs,
     GenericWorkflowInputs,
     HomewbrewWorkflowInputs,
     NeedToPublishRelease,
@@ -351,12 +350,8 @@ def create_extract_result_tree_branch(
         return extract_artifact_result
 
 
-class DebianFactory(GenericPackageFactory):
-    """Factory for Debian packages.
-
-    Inherits from GenericFactory and overrides only the methods that need
-    Debian-specific behavior.
-    """
+class DockerFactory(GenericPackageFactory):
+    """Factory for Docker packages."""
 
     def create_build_workflow_inputs(
         self,
@@ -366,8 +361,7 @@ def create_build_workflow_inputs(
         release_meta: ReleaseMeta,
         log_prefix: str,
     ) -> Behaviour:
-
-        return DebianWorkflowInputs(
+        return DockerWorkflowInputs(
             name, workflow, package_meta, release_meta, log_prefix=log_prefix
         )
 
@@ -379,16 +373,16 @@ def create_publish_workflow_inputs(
         release_meta: ReleaseMeta,
         log_prefix: str,
     ) -> Behaviour:
-        from .behaviours import DebianWorkflowInputs
-
-        return DebianWorkflowInputs(
+        return DockerWorkflowInputs(
             name, workflow, package_meta, release_meta, log_prefix=log_prefix
         )
 
 
-class DockerFactory(GenericPackageFactory):
-    """Factory for Docker packages."""
+class DebianFactory(GenericPackageFactory):
+    pass
 
+
+class RPMFactory(GenericPackageFactory):
     pass
 
 
@@ -539,8 +533,9 @@ def create_build_workflow_inputs(
 
 # Factory registry
 _FACTORIES: Dict[PackageType, GenericPackageFactory] = {
-    PackageType.DEBIAN: DebianFactory(),
     PackageType.DOCKER: DockerFactory(),
+    PackageType.DEBIAN: DebianFactory(),
+    PackageType.RPM: RPMFactory(),
     PackageType.HOMEBREW: HomebrewFactory(),
 }
 

src/redis_release/cli.py

@@ -147,7 +147,7 @@ def release(
         help="Only process specific packages (can be specified multiple times)",
     ),
     tree_cutoff: int = typer.Option(
-        2000, "--tree-cutoff", "-m", help="Max number of ticks to run the tree for"
+        5000, "--tree-cutoff", "-m", help="Max number of ticks to run the tree for"
     ),
     force_release_type: Optional[List[str]] = typer.Option(
         None,

src/redis_release/state_manager.py

@@ -13,7 +13,6 @@
 
 from redis_release.bht.state import ReleaseState, logger
 from redis_release.config import Config
-from redis_release.state_display import print_state_table
 
 from .bht.state import ReleaseState
 from .models import ReleaseArgs