qontract-reconcile 0.10.1rc766__py3-none-any.whl → 0.10.1rc767__py3-none-any.whl

{qontract_reconcile-0.10.1rc766.dist-info → qontract_reconcile-0.10.1rc767.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: qontract-reconcile
-Version: 0.10.1rc766
+Version: 0.10.1rc767
 Summary: Collection of tools to reconcile services with their desired state as defined in the app-interface DB.
 Home-page: https://github.com/app-sre/qontract-reconcile
 Author: Red Hat App-SRE Team

{qontract_reconcile-0.10.1rc766.dist-info → qontract_reconcile-0.10.1rc767.dist-info}/RECORD

@@ -406,19 +406,20 @@ reconcile/rhidp/sso_client/base.py,sha256=EfQ2ewcOKh5idg46UKAkY6z0m_nGQfvnQKffa2
 reconcile/rhidp/sso_client/integration.py,sha256=kA8g7c38ZBSdrRtyfEqy_WgSreD1PbwY7ZIN-3tZRPc,2221
 reconcile/rhidp/sso_client/metrics.py,sha256=Tq7tSOsqL3XdcPUdozxqzSPIodUeOV87UCTqpuuqqhw,1013
 reconcile/saas_auto_promotions_manager/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-reconcile/saas_auto_promotions_manager/integration.py,sha256=shWQ--FWfeh_1rHJUwOWDiZWnvzKxYJYuRUIGQv22RI,6759
-reconcile/saas_auto_promotions_manager/meta.py,sha256=jzqK6qM2JDdCE5kzkcj1e1TBMAL9f6lM2Hse8yFb8W8,161
+reconcile/saas_auto_promotions_manager/integration.py,sha256=8IXLEvpblgZRr2UPfTsaLZIUDJOdJaoakhqLBkGU_Es,6750
+reconcile/saas_auto_promotions_manager/meta.py,sha256=76Jp50r6Y_KyJoXFfSjrt5YrCtXyg_A4FXXxHYiS3TE,161
 reconcile/saas_auto_promotions_manager/publisher.py,sha256=psrthZGgCQDUO3rwQjKSBMlwcTgfij6sxdebGuxkNv4,2739
 reconcile/saas_auto_promotions_manager/s3_exporter.py,sha256=IKlVWZmiPnvl7sKeF6JgAlhXZe5CovKTxQc0SNkNSx4,2583
 reconcile/saas_auto_promotions_manager/subscriber.py,sha256=NPhlagNF8om7ikrjRlYNSQ2Ra7wgW_3-OlEWapnjtW0,9405
 reconcile/saas_auto_promotions_manager/merge_request_manager/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-reconcile/saas_auto_promotions_manager/merge_request_manager/desired_state.py,sha256=jgfgKv4UTYFxtDao_JwNEGEKmu4GpeMm5vbaat0289c,1225
+reconcile/saas_auto_promotions_manager/merge_request_manager/batcher.py,sha256=lHIULPE8nmPN9pJVfZFdD0l48EB20o4cAy4owahJenw,7848
+reconcile/saas_auto_promotions_manager/merge_request_manager/desired_state.py,sha256=isY8frVsL3PlcdZmdZ4O0qyp76oczl4DUMX9uMArs5Y,1222
 reconcile/saas_auto_promotions_manager/merge_request_manager/merge_request.py,sha256=BeAJWLow7b4HQyZ9zz398sQkPeIz8chpMkCts2NU27c,1282
-reconcile/saas_auto_promotions_manager/merge_request_manager/merge_request_manager_v2.py,sha256=IRLHdz-XMn-rIb0jFddYkIuN9c7FC6InJZ61c9fVjvI,6193
+reconcile/saas_auto_promotions_manager/merge_request_manager/merge_request_manager_v2.py,sha256=-zWK-cqr_8o9ZEnNfD3cfkv3hrrU4HJ4UMzi4J2Hjhw,6223
 reconcile/saas_auto_promotions_manager/merge_request_manager/metrics.py,sha256=sdHp71Wl87tFM-Z_QvqvdHhyrppFLGi4ekksCi_e_bs,977
-reconcile/saas_auto_promotions_manager/merge_request_manager/mr_parser.py,sha256=x8Gg-YjEFWEeDPJH3Y8SrfcJbwhLuAqCz4kIhfEyaaA,7060
-reconcile/saas_auto_promotions_manager/merge_request_manager/reconciler.py,sha256=KZVAkFJR75Qu7-feV4mzg1S8ua-pkbuu1oC7PebSpDs,7801
-reconcile/saas_auto_promotions_manager/merge_request_manager/renderer.py,sha256=iu0wMyyEvro5r5SBJVN3HGmVSIcxTyLN0Xxx3mhbYXE,7066
+reconcile/saas_auto_promotions_manager/merge_request_manager/mr_parser.py,sha256=WDpClngRA7o9j9o8WsTDDU42p_xVqkmr6dERxQXBIAA,8579
+reconcile/saas_auto_promotions_manager/merge_request_manager/open_merge_requests.py,sha256=-qGQOh6Jdp4lomNDij3zWVC0pl6uPHFWS5Woqcp5HQk,410
+reconcile/saas_auto_promotions_manager/merge_request_manager/renderer.py,sha256=ERi-a400C-c0HnAyS6EsvCrsyY3MO4xL8N3A1e04T4M,7087
 reconcile/saas_auto_promotions_manager/utils/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 reconcile/saas_auto_promotions_manager/utils/saas_files_inventory.py,sha256=7LlTQCzYotWCbtYBaNQP81CFlLUOvsyGMBQE-Ha0cKY,7820
 reconcile/skupper_network/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -535,15 +536,15 @@ reconcile/test/test_vpc_peerings_validator.py,sha256=dFSmjc_dMN2GqMbntCFpa7PUZmy
 reconcile/test/test_wrong_region.py,sha256=7KzL7OaICQ9Z3DW27zt_ykMN7_87owAFC-2CYjvGoyA,2138
 reconcile/test/saas_auto_promotions_manager/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 reconcile/test/saas_auto_promotions_manager/conftest.py,sha256=4BtuxVZ0Lsmdp6AhG8kbtowkwG7e-pSjIKv35Wm1hI0,5803
-reconcile/test/saas_auto_promotions_manager/test_integration_test.py,sha256=x7QgHDMKIoPRY8k2SRSWa7qY3Z5Vabsyh9xWCtMXtfY,1857
+reconcile/test/saas_auto_promotions_manager/test_integration_test.py,sha256=S30eXJSy2Vc3YLbCP7AfLkOiFGUVoKhEvEBL5vwnbfg,1848
 reconcile/test/saas_auto_promotions_manager/merge_request_manager/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 reconcile/test/saas_auto_promotions_manager/merge_request_manager/merge_request_manager/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-reconcile/test/saas_auto_promotions_manager/merge_request_manager/merge_request_manager/conftest.py,sha256=HikuDsdDxJ6HW48WY50s_7fmeGr07kcRdBZxgHzwc-0,3514
+reconcile/test/saas_auto_promotions_manager/merge_request_manager/merge_request_manager/conftest.py,sha256=y_SL9zBr98SlOnvbA9C7a0_dFZrRAbkuR85m_u6ijcI,3520
 reconcile/test/saas_auto_promotions_manager/merge_request_manager/merge_request_manager/data_keys.py,sha256=Z1IV51OUuzhd-3S8W-k7ixC-fkaglCokn0eakK0Z73s,606
 reconcile/test/saas_auto_promotions_manager/merge_request_manager/merge_request_manager/test_desired_state.py,sha256=OLtJ11SsznoT39_tudsozcksK0N3TVNv-JWhIrCVaQk,2356
-reconcile/test/saas_auto_promotions_manager/merge_request_manager/merge_request_manager/test_merge_request_manager.py,sha256=h8lnorFPZIxTtbaaXGLoiEsBbB4Qj-Mg9BKV62ZqEBQ,2389
-reconcile/test/saas_auto_promotions_manager/merge_request_manager/merge_request_manager/test_mr_parser.py,sha256=dcGHzxuafKSxmswSO1qF2WlKaqsmEvtERC6Lb8kDAN0,10019
-reconcile/test/saas_auto_promotions_manager/merge_request_manager/merge_request_manager/test_reconciler.py,sha256=_bzfJzjFJgubu--7wyXIiusUrdbmLtFbHmkbat4SX_M,17828
+reconcile/test/saas_auto_promotions_manager/merge_request_manager/merge_request_manager/test_merge_request_manager.py,sha256=5jOrR5flENfqz7c9ADnjm-yPl7DJLTyVZM1ndvm9MVY,2491
+reconcile/test/saas_auto_promotions_manager/merge_request_manager/merge_request_manager/test_mr_parser.py,sha256=aohFc18g9DKt0kK1YypXJrBGE8eGhsVMOGd1KOCzX0k,11677
+reconcile/test/saas_auto_promotions_manager/merge_request_manager/merge_request_manager/test_reconciler.py,sha256=REBOmIt1hwu9K5zqyQdKIDhma2YUWIKidI7SJ4GB9ZE,17969
 reconcile/test/saas_auto_promotions_manager/merge_request_manager/renderer/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 reconcile/test/saas_auto_promotions_manager/merge_request_manager/renderer/conftest.py,sha256=MjTLg7KwvdIYvxkCzgJG-gByD1fZxaq6c4SI6rWWUu8,552
 reconcile/test/saas_auto_promotions_manager/merge_request_manager/renderer/test_content_multiple_namespaces.py,sha256=6LMsnbPx5svTF1nL6oQGLTp1NgjLG_tO56c0hbA2Di4,1059
@@ -782,8 +783,8 @@ tools/test/test_app_interface_metrics_exporter.py,sha256=SX7qL3D1SIRKFo95FoQztvf
 tools/test/test_qontract_cli.py,sha256=w2l4BHB09k1d-BGJ1jBUNCqDv7zkqYrMHojQXg-21kQ,4155
 tools/test/test_sd_app_sre_alert_report.py,sha256=v363r9zM7__0kR5K6mvJoGFcM9BvE33fWAayrqkpojA,2116
 tools/test/test_sre_checkpoints.py,sha256=SKqPPTl9ua0RFdSSofnoQX-JZE6dFLO3LRhfQzqtfh8,2607
-qontract_reconcile-0.10.1rc766.dist-info/METADATA,sha256=tFpqi2YNRp9SyjmZicHUP7W6onmCER5zHM7Y-fD6qa0,2382
-qontract_reconcile-0.10.1rc766.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
-qontract_reconcile-0.10.1rc766.dist-info/entry_points.txt,sha256=rIxI5zWtHNlfpDeq1a7pZXAPoqf7HG32KMTN3MeWK_8,429
-qontract_reconcile-0.10.1rc766.dist-info/top_level.txt,sha256=l5ISPoXzt0SdR4jVdkfa7RPSKNc8zAHYWAnR-Dw8Ey8,24
-qontract_reconcile-0.10.1rc766.dist-info/RECORD,,
+qontract_reconcile-0.10.1rc767.dist-info/METADATA,sha256=JWA4m9u9lod5MIvLOvk3dDfvQrKGG8cmdIdd4tpoU9M,2382
+qontract_reconcile-0.10.1rc767.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
+qontract_reconcile-0.10.1rc767.dist-info/entry_points.txt,sha256=rIxI5zWtHNlfpDeq1a7pZXAPoqf7HG32KMTN3MeWK_8,429
+qontract_reconcile-0.10.1rc767.dist-info/top_level.txt,sha256=l5ISPoXzt0SdR4jVdkfa7RPSKNc8zAHYWAnR-Dw8Ey8,24
+qontract_reconcile-0.10.1rc767.dist-info/RECORD,,

reconcile/saas_auto_promotions_manager/integration.py

@@ -6,15 +6,15 @@ from sretoolbox.utils import threaded
 from reconcile.openshift_saas_deploy import (
     QONTRACT_INTEGRATION as OPENSHIFT_SAAS_DEPLOY,
 )
+from reconcile.saas_auto_promotions_manager.merge_request_manager.batcher import (
+    Batcher,
+)
 from reconcile.saas_auto_promotions_manager.merge_request_manager.merge_request_manager_v2 import (
     MergeRequestManagerV2,
 )
 from reconcile.saas_auto_promotions_manager.merge_request_manager.mr_parser import (
     MRParser,
 )
-from reconcile.saas_auto_promotions_manager.merge_request_manager.reconciler import (
-    Reconciler,
-)
 from reconcile.saas_auto_promotions_manager.merge_request_manager.renderer import (
     Renderer,
 )
@@ -135,7 +135,7 @@ def init_external_dependencies(
     mr_parser = MRParser(vcs=vcs)
     merge_request_manager_v2 = MergeRequestManagerV2(
         vcs=vcs,
-        reconciler=Reconciler(),
+        reconciler=Batcher(),
         mr_parser=mr_parser,
         renderer=Renderer(),
     )

reconcile/saas_auto_promotions_manager/merge_request_manager/{reconciler.py → batcher.py}

@@ -3,8 +3,8 @@ from dataclasses import dataclass
 from enum import Enum
 from typing import Optional
 
-from reconcile.saas_auto_promotions_manager.merge_request_manager.mr_parser import (
-    OpenMergeRequest,
+from reconcile.saas_auto_promotions_manager.merge_request_manager.open_merge_requests import (
+    OpenBatcherMergeRequest,
 )
 
 
@@ -22,7 +22,7 @@ class Promotion:
 
 @dataclass
 class Deletion:
-    mr: OpenMergeRequest
+    mr: OpenBatcherMergeRequest
     reason: Reason
 
 
@@ -39,18 +39,18 @@ class Diff:
     additions: list[Addition]
 
 
-class Reconciler:
+class Batcher:
     """
-    The reconciler calculates a Diff. I.e., which MRs need to be opened (Addition)
-    and which MRs need to be closed (Deletion). The reconciler has no external
-    dependencies and does not interact with VCS. The reconciler expects to be
+    The batcher calculates a Diff. I.e., which MRs need to be opened (Addition)
+    and which MRs need to be closed (Deletion). The batcher has no external
+    dependencies and does not interact with VCS. The batcher expects to be
     given the desired state (which promotions do we want) and the current state
     (the currently open MRs) in order to calculate the Diff.
     """
 
     def __init__(self) -> None:
         self._desired_promotions: Iterable[Promotion] = []
-        self._open_mrs: Iterable[OpenMergeRequest] = []
+        self._open_mrs: Iterable[OpenBatcherMergeRequest] = []
 
     def _unbatch(self, diff: Diff) -> None:
         """
@@ -61,7 +61,7 @@ class Reconciler:
         and close the old batched MR. By doing so, we ensure that unrelated MRs are not blocking each other.
         Unbatched MRs are marked and will never be batched again.
         """
-        open_mrs_after_unbatching: list[OpenMergeRequest] = []
+        open_mrs_after_unbatching: list[OpenBatcherMergeRequest] = []
         unbatchable_hashes: set[str] = set()
         falsely_marked_batchable_hashes: set[str] = set()
         for mr in self._open_mrs:
@@ -107,7 +107,7 @@ class Reconciler:
         for promotion in self._desired_promotions:
             all_desired_content_hashes.update(promotion.content_hashes)
 
-        open_mrs_after_deletion: list[OpenMergeRequest] = []
+        open_mrs_after_deletion: list[OpenBatcherMergeRequest] = []
         for mr in self._open_mrs:
             if mr.content_hashes.issubset(all_desired_content_hashes):
                 open_mrs_after_deletion.append(mr)
@@ -145,7 +145,7 @@ class Reconciler:
         if not unsubmitted_promotions:
             return
 
-        batch_with_capacity: Optional[OpenMergeRequest] = None
+        batch_with_capacity: Optional[OpenBatcherMergeRequest] = None
         for mr in self._open_mrs:
             if mr.is_batchable and len(mr.content_hashes) < batch_limit:
                 batch_with_capacity = mr
@@ -194,7 +194,7 @@ class Reconciler:
     def reconcile(
         self,
         desired_promotions: Iterable[Promotion],
-        open_mrs: Iterable[OpenMergeRequest],
+        open_mrs: Iterable[OpenBatcherMergeRequest],
         batch_limit: int,
     ) -> Diff:
         self._open_mrs = open_mrs

reconcile/saas_auto_promotions_manager/merge_request_manager/desired_state.py

@@ -1,7 +1,7 @@
 from collections import defaultdict
 from collections.abc import Iterable
 
-from reconcile.saas_auto_promotions_manager.merge_request_manager.reconciler import (
+from reconcile.saas_auto_promotions_manager.merge_request_manager.batcher import (
     Promotion,
 )
 from reconcile.saas_auto_promotions_manager.subscriber import Subscriber

reconcile/saas_auto_promotions_manager/merge_request_manager/merge_request_manager_v2.py

@@ -3,6 +3,10 @@ from collections.abc import Iterable
 
 from gitlab.exceptions import GitlabGetError
 
+from reconcile.saas_auto_promotions_manager.merge_request_manager.batcher import (
+    Addition,
+    Batcher,
+)
 from reconcile.saas_auto_promotions_manager.merge_request_manager.desired_state import (
     DesiredState,
 )
@@ -21,10 +25,6 @@ from reconcile.saas_auto_promotions_manager.merge_request_manager.metrics import
 from reconcile.saas_auto_promotions_manager.merge_request_manager.mr_parser import (
     MRParser,
 )
-from reconcile.saas_auto_promotions_manager.merge_request_manager.reconciler import (
-    Addition,
-    Reconciler,
-)
 from reconcile.saas_auto_promotions_manager.merge_request_manager.renderer import (
     Renderer,
 )
@@ -61,7 +61,7 @@ class MergeRequestManagerV2:
     """
 
     def __init__(
-        self, vcs: VCS, mr_parser: MRParser, reconciler: Reconciler, renderer: Renderer
+        self, vcs: VCS, mr_parser: MRParser, reconciler: Batcher, renderer: Renderer
     ):
         self._vcs = vcs
         self._mr_parser = mr_parser
@@ -130,7 +130,8 @@ class MergeRequestManagerV2:
         )
 
     def reconcile(self, subscribers: Iterable[Subscriber]) -> None:
-        current_state = self._mr_parser.retrieve_open_mrs(label=SAPM_LABEL)
+        self._mr_parser.fetch_mrs(label=SAPM_LABEL)
+        current_state = self._mr_parser.get_open_batcher_mrs()
         desired_state = DesiredState(subscribers=subscribers)
         self._desired_state = desired_state
 

reconcile/saas_auto_promotions_manager/merge_request_manager/mr_parser.py

@@ -1,29 +1,25 @@
 import logging
 import re
-from dataclasses import dataclass
+from collections.abc import Iterable
 
 from gitlab.v4.objects import ProjectMergeRequest
 
+from reconcile.saas_auto_promotions_manager.merge_request_manager.open_merge_requests import (
+    MRKind,
+    OpenBatcherMergeRequest,
+    OpenSchedulerMergeRequest,
+)
 from reconcile.saas_auto_promotions_manager.merge_request_manager.renderer import (
     CHANNELS_REF,
     CONTENT_HASHES,
     IS_BATCHABLE,
+    MR_KIND_REF,
     PROMOTION_DATA_SEPARATOR,
     SAPM_VERSION,
     VERSION_REF,
 )
 from reconcile.utils.vcs import VCS, MRCheckStatus
 
-
-@dataclass
-class OpenMergeRequest:
-    raw: ProjectMergeRequest
-    content_hashes: set[str]
-    channels: set[str]
-    failed_mr_check: bool
-    is_batchable: bool
-
-
 ITEM_SEPARATOR = ","
 
 
@@ -41,6 +37,15 @@ class MRParser:
         self._content_hash_regex = re.compile(rf"{CONTENT_HASHES}: (.*)$", re.MULTILINE)
         self._channels_regex = re.compile(rf"{CHANNELS_REF}: (.*)$", re.MULTILINE)
         self._is_batchable_regex = re.compile(rf"{IS_BATCHABLE}: (.*)$", re.MULTILINE)
+        self._mr_kind_regex = re.compile(rf"{MR_KIND_REF}: (.*)$", re.MULTILINE)
+        self._open_batcher_mrs: list[OpenBatcherMergeRequest] = []
+        self._open_scheduler_mrs: list[OpenSchedulerMergeRequest] = []
+
+    def get_open_batcher_mrs(self) -> list[OpenBatcherMergeRequest]:
+        return self._open_batcher_mrs
+
+    def get_open_scheduler_mrs(self) -> list[OpenSchedulerMergeRequest]:
+        return self._open_scheduler_mrs
 
     def _apply_regex(self, pattern: re.Pattern, promotion_data: str) -> str:
         matches = pattern.search(promotion_data)
@@ -51,15 +56,9 @@ class MRParser:
             return ""
         return groups[0]
 
-    def _fetch_sapm_managed_open_merge_requests(
-        self, label: str
-    ) -> list[ProjectMergeRequest]:
-        all_open_mrs = self._vcs.get_open_app_interface_merge_requests()
-        return [mr for mr in all_open_mrs if label in mr.attributes.get("labels")]
-
-    def retrieve_open_mrs(self, label: str) -> list[OpenMergeRequest]:
+    def fetch_mrs(self, label: str) -> None:
         """
-        This function parses the state and returns a list of valid, parsed open MRs (current state).
+        This function parses the state of valid, parsed open MRs (current state).
         If any issue is encountered during parsing, we consider this MR
         to be broken and close it. Information we want to parse includes:
         - SAPM_VERSION -> Close if it doesnt match current version
@@ -68,21 +67,14 @@ class MRParser:
         - IS_BATCHABLE flag
         - MR has merge conflicts
         """
-        open_mrs: list[OpenMergeRequest] = []
-        seen: set[tuple[str, str, str]] = set()
-        for mr in self._fetch_sapm_managed_open_merge_requests(label=label):
+        all_open_mrs = self._vcs.get_open_app_interface_merge_requests()
+        sapm_mrs = [mr for mr in all_open_mrs if label in mr.attributes.get("labels")]
+        open_batcher_mrs: list[ProjectMergeRequest] = []
+        open_scheduler_mrs: list[ProjectMergeRequest] = []
+
+        for mr in sapm_mrs:
             attrs = mr.attributes
             desc = attrs.get("description")
-            has_conflicts = attrs.get("has_conflicts", False)
-            if has_conflicts:
-                logging.info(
-                    "Merge-conflict detected. Closing %s",
-                    mr.attributes.get("web_url", "NO_WEBURL"),
-                )
-                self._vcs.close_app_interface_mr(
-                    mr, "Closing this MR because of a merge-conflict."
-                )
-                continue
             parts = desc.split(PROMOTION_DATA_SEPARATOR)
             if not len(parts) == 2:
                 logging.info(
@@ -121,6 +113,49 @@ class MRParser:
                 )
                 continue
 
+            mr_kind_str = self._apply_regex(
+                pattern=self._mr_kind_regex, promotion_data=promotion_data
+            )
+            if not mr_kind_str or mr_kind_str not in {
+                MRKind.BATCHER.value,
+                MRKind.SCHEDULER.value,
+            }:
+                logging.info(
+                    "Bad %s format. Closing %s",
+                    MR_KIND_REF,
+                    mr.attributes.get("web_url", "NO_WEBURL"),
+                )
+                self._vcs.close_app_interface_mr(
+                    mr, f"Closing this MR because of bad {MR_KIND_REF} format."
+                )
+                continue
+
+            mr_kind = MRKind(mr_kind_str)
+            if mr_kind == MRKind.BATCHER:
+                open_batcher_mrs.append(mr)
+            elif mr_kind == MRKind.SCHEDULER:
+                open_scheduler_mrs.append(mr)
+
+        self._handle_open_batcher_mrs(open_batcher_mrs)
+
+    def _handle_open_batcher_mrs(self, mrs: Iterable[ProjectMergeRequest]) -> None:
+        seen: set[tuple[str, str]] = set()
+        for mr in mrs:
+            attrs = mr.attributes
+            desc = attrs.get("description")
+            parts = desc.split(PROMOTION_DATA_SEPARATOR)
+            promotion_data = parts[1]
+            has_conflicts = attrs.get("has_conflicts", False)
+            if has_conflicts:
+                logging.info(
+                    "Merge-conflict detected. Closing %s",
+                    mr.attributes.get("web_url", "NO_WEBURL"),
+                )
+                self._vcs.close_app_interface_mr(
+                    mr, "Closing this MR because of a merge-conflict."
+                )
+                continue
+
             content_hashes = self._apply_regex(
                 pattern=self._content_hash_regex, promotion_data=promotion_data
             )
@@ -149,7 +184,7 @@ class MRParser:
                 )
                 continue
 
-            key = (version_ref, channels_refs, content_hashes)
+            key = (channels_refs, content_hashes)
             if key in seen:
                 logging.info(
                     "Duplicate MR detected. Closing %s",
@@ -178,8 +213,8 @@ class MRParser:
 
             mr_check_status = self._vcs.get_gitlab_mr_check_status(mr)
 
-            open_mrs.append(
-                OpenMergeRequest(
+            self._open_batcher_mrs.append(
+                OpenBatcherMergeRequest(
                     raw=mr,
                     content_hashes=set(content_hashes.split(ITEM_SEPARATOR)),
                     channels=set(channels_refs.split(ITEM_SEPARATOR)),
@@ -187,4 +222,3 @@ class MRParser:
                     is_batchable=is_batchable_str == "True",
                 )
             )
-        return open_mrs

reconcile/saas_auto_promotions_manager/merge_request_manager/open_merge_requests.py

@@ -0,0 +1,23 @@
+from dataclasses import dataclass
+from enum import Enum
+
+from gitlab.v4.objects import ProjectMergeRequest
+
+
+class MRKind(Enum):
+    BATCHER = "batcher"
+    SCHEDULER = "scheduler"
+
+
+@dataclass
+class OpenBatcherMergeRequest:
+    raw: ProjectMergeRequest
+    content_hashes: set[str]
+    channels: set[str]
+    failed_mr_check: bool
+    is_batchable: bool
+
+
+@dataclass
+class OpenSchedulerMergeRequest:
+    pass

reconcile/saas_auto_promotions_manager/merge_request_manager/renderer.py

@@ -25,6 +25,7 @@ CONTENT_HASHES = "content_hashes"
 CHANNELS_REF = "channels"
 IS_BATCHABLE = "is_batchable"
 VERSION_REF = "sapm_version"
+MR_KIND_REF = "kind"
 
 
 class Renderer:

reconcile/saas_auto_promotions_manager/meta.py

@@ -1,4 +1,4 @@
 from reconcile.utils.semver_helper import make_semver
 
 QONTRACT_INTEGRATION = "saas-auto-promotions-manager"
-QONTRACT_INTEGRATION_VERSION = make_semver(2, 2, 0)
+QONTRACT_INTEGRATION_VERSION = make_semver(2, 3, 0)

reconcile/test/saas_auto_promotions_manager/merge_request_manager/merge_request_manager/conftest.py

@@ -8,16 +8,16 @@ from unittest.mock import create_autospec
 import pytest
 from gitlab.v4.objects import ProjectMergeRequest
 
+from reconcile.saas_auto_promotions_manager.merge_request_manager.batcher import (
+    Batcher,
+    Diff,
+)
 from reconcile.saas_auto_promotions_manager.merge_request_manager.merge_request_manager_v2 import (
     SAPM_LABEL,
 )
 from reconcile.saas_auto_promotions_manager.merge_request_manager.mr_parser import (
     MRParser,
-    OpenMergeRequest,
-)
-from reconcile.saas_auto_promotions_manager.merge_request_manager.reconciler import (
-    Diff,
-    Reconciler,
+    OpenBatcherMergeRequest,
 )
 from reconcile.saas_auto_promotions_manager.merge_request_manager.renderer import (
     CHANNELS_REF,
@@ -91,8 +91,8 @@ def vcs_builder(
 
 
 @pytest.fixture
-def mr_parser_builder() -> Callable[[Iterable[OpenMergeRequest]], MRParser]:
-    def builder(data: Iterable[OpenMergeRequest]) -> MRParser:
+def mr_parser_builder() -> Callable[[Iterable[OpenBatcherMergeRequest]], MRParser]:
+    def builder(data: Iterable[OpenBatcherMergeRequest]) -> MRParser:
         mr_parser = create_autospec(spec=MRParser)
         mr_parser.retrieve_open_mrs.side_effect = [data]
         return mr_parser
@@ -101,9 +101,9 @@ def mr_parser_builder() -> Callable[[Iterable[OpenMergeRequest]], MRParser]:
 
 
 @pytest.fixture
-def reconciler_builder() -> Callable[[Diff], Reconciler]:
-    def builder(data: Diff) -> Reconciler:
-        reconciler = create_autospec(spec=Reconciler)
+def reconciler_builder() -> Callable[[Diff], Batcher]:
+    def builder(data: Diff) -> Batcher:
+        reconciler = create_autospec(spec=Batcher)
         reconciler.reconcile.side_effect = [data]
         return reconciler
 

reconcile/test/saas_auto_promotions_manager/merge_request_manager/merge_request_manager/test_merge_request_manager.py

@@ -3,19 +3,21 @@ from unittest.mock import call, create_autospec
 
 from gitlab.v4.objects import ProjectMergeRequest
 
+from reconcile.saas_auto_promotions_manager.merge_request_manager.batcher import (
+    Addition,
+    Batcher,
+    Deletion,
+    Diff,
+    Reason,
+)
 from reconcile.saas_auto_promotions_manager.merge_request_manager.merge_request_manager_v2 import (
     MergeRequestManagerV2,
 )
 from reconcile.saas_auto_promotions_manager.merge_request_manager.mr_parser import (
     MRParser,
-    OpenMergeRequest,
 )
-from reconcile.saas_auto_promotions_manager.merge_request_manager.reconciler import (
-    Addition,
-    Deletion,
-    Diff,
-    Reason,
-    Reconciler,
+from reconcile.saas_auto_promotions_manager.merge_request_manager.open_merge_requests import (
+    OpenBatcherMergeRequest,
 )
 from reconcile.saas_auto_promotions_manager.merge_request_manager.renderer import (
     Renderer,
@@ -29,7 +31,7 @@ from reconcile.utils.vcs import VCS
 
 
 def test_reconcile(
-    reconciler_builder: Callable[[Diff], Reconciler],
+    reconciler_builder: Callable[[Diff], Batcher],
     subscriber_builder: Callable[..., Subscriber],
 ) -> None:
     vcs = create_autospec(spec=VCS)
@@ -42,7 +44,7 @@ def test_reconcile(
         })
     ]
     deletion = Deletion(
-        mr=OpenMergeRequest(
+        mr=OpenBatcherMergeRequest(
             raw=create_autospec(spec=ProjectMergeRequest),
             channels=set(),
             content_hashes=set(),

reconcile/test/saas_auto_promotions_manager/merge_request_manager/merge_request_manager/test_mr_parser.py

@@ -12,10 +12,14 @@ from reconcile.saas_auto_promotions_manager.merge_request_manager.merge_request_
 from reconcile.saas_auto_promotions_manager.merge_request_manager.mr_parser import (
     MRParser,
 )
+from reconcile.saas_auto_promotions_manager.merge_request_manager.open_merge_requests import (
+    MRKind,
+)
 from reconcile.saas_auto_promotions_manager.merge_request_manager.renderer import (
     CHANNELS_REF,
     CONTENT_HASHES,
     IS_BATCHABLE,
+    MR_KIND_REF,
     PROMOTION_DATA_SEPARATOR,
     SAPM_VERSION,
     VERSION_REF,
@@ -44,6 +48,7 @@ def test_valid_parsing(
                     {CHANNELS_REF}: channel0
                     {CONTENT_HASHES}: hash0
                     {IS_BATCHABLE}: True
+                    {MR_KIND_REF}: {MRKind.BATCHER.value}
                 """,
             },
             {
@@ -55,6 +60,7 @@ def test_valid_parsing(
                     {CHANNELS_REF}: channel1
                     {CONTENT_HASHES}: hash1
                     {IS_BATCHABLE}: False
+                    {MR_KIND_REF}: {MRKind.BATCHER.value}
                 """,
             },
         ]
@@ -62,7 +68,8 @@ def test_valid_parsing(
     mr_parser = MRParser(
         vcs=vcs,
     )
-    open_mrs = mr_parser.retrieve_open_mrs(label=SAPM_LABEL)
+    mr_parser.fetch_mrs(label=SAPM_LABEL)
+    open_mrs = mr_parser._open_batcher_mrs
     assert len(open_mrs) == 2
 
     assert open_mrs[0].raw == expectd_mrs[0]
@@ -90,6 +97,7 @@ def test_labels_filter(
                     {CHANNELS_REF}: other-channel
                     {CONTENT_HASHES}: other_hash
                     {IS_BATCHABLE}: True
+                    {MR_KIND_REF}: {MRKind.BATCHER.value}
                 """,
             },
             # This MR should get ignored
@@ -102,6 +110,7 @@ def test_labels_filter(
                     {CHANNELS_REF}: some-channel
                     {CONTENT_HASHES}: some_hash
                     {IS_BATCHABLE}: True
+                    {MR_KIND_REF}: {MRKind.BATCHER.value}
                 """,
             },
         ]
@@ -109,7 +118,8 @@ def test_labels_filter(
     mr_parser = MRParser(
         vcs=vcs,
     )
-    open_mrs = mr_parser.retrieve_open_mrs(label=SAPM_LABEL)
+    mr_parser.fetch_mrs(label=SAPM_LABEL)
+    open_mrs = mr_parser.get_open_batcher_mrs()
     assert len(open_mrs) == 1
     assert open_mrs[0].raw == expectd_mrs[0]
 
@@ -128,6 +138,7 @@ def test_bad_mrs(
                     {CHANNELS_REF}: some-channel
                     {CONTENT_HASHES}: hash_1
                     {IS_BATCHABLE}: True
+                    {MR_KIND_REF}: {MRKind.BATCHER.value}
                 """,
             },
             {
@@ -139,6 +150,7 @@ def test_bad_mrs(
                     {CHANNELS_REF}: some-channel
                     {IS_BATCHABLE}: True
                     missing-content-hash-key: some_hash
+                    {MR_KIND_REF}: {MRKind.BATCHER.value}
                 """,
             },
             {
@@ -149,6 +161,7 @@ def test_bad_mrs(
                     {VERSION_REF}: {SAPM_VERSION}
                     {CONTENT_HASHES}: hash_3
                     {IS_BATCHABLE}: True
+                    {MR_KIND_REF}: {MRKind.BATCHER.value}
                 """,
             },
             {
@@ -160,6 +173,7 @@ def test_bad_mrs(
                     {CHANNELS_REF}: some-channel
                     {CONTENT_HASHES}: hash_4
                     {IS_BATCHABLE}: True
+                    {MR_KIND_REF}: {MRKind.BATCHER.value}
                 """,
             },
             {
@@ -173,6 +187,7 @@ def test_bad_mrs(
                     {CHANNELS_REF}: some-channel
                     {CONTENT_HASHES}: hash_5
                     {IS_BATCHABLE}: True
+                    {MR_KIND_REF}: {MRKind.BATCHER.value}
                 """,
             },
             {
@@ -184,6 +199,7 @@ def test_bad_mrs(
                     {CHANNELS_REF}: some-channel
                     {CONTENT_HASHES}: hash_6
                     {IS_BATCHABLE}: True
+                    {MR_KIND_REF}: {MRKind.BATCHER.value}
                 """,
             },
             {
@@ -195,6 +211,7 @@ def test_bad_mrs(
                     bad_channel_ref: some-channel
                     {CONTENT_HASHES}: hash_7
                     {IS_BATCHABLE}: True
+                    {MR_KIND_REF}: {MRKind.BATCHER.value}
                 """,
             },
             {
@@ -206,6 +223,7 @@ def test_bad_mrs(
                     {CHANNELS_REF}: some-channel
                     {CONTENT_HASHES}: hash_8
                     missing-batchable-key
+                    {MR_KIND_REF}: {MRKind.BATCHER.value}
                 """,
             },
             {
@@ -217,6 +235,19 @@ def test_bad_mrs(
                     {CHANNELS_REF}: some-channel
                     {CONTENT_HASHES}: hash_9
                     {IS_BATCHABLE}: Something-non-bool
+                    {MR_KIND_REF}: {MRKind.BATCHER.value}
+                """,
+            },
+            {
+                LABELS: [SAPM_LABEL],
+                DESCRIPTION: f"""
+                    Blabla
+                    {PROMOTION_DATA_SEPARATOR}
+                    {VERSION_REF}: {SAPM_VERSION}
+                    {CHANNELS_REF}: some-channel
+                    {CONTENT_HASHES}: hash_10
+                    {IS_BATCHABLE}: True
+                    {MR_KIND_REF}: blub
                 """,
             },
         ]
@@ -261,11 +292,16 @@ def test_bad_mrs(
             expected_mrs[8],
             "Closing this MR because of bad is_batchable format.",
         ),
+        call(
+            expected_mrs[9],
+            "Closing this MR because of bad kind format.",
+        ),
     ]
 
-    open_mrs = mr_parser.retrieve_open_mrs(label=SAPM_LABEL)
+    mr_parser.fetch_mrs(label=SAPM_LABEL)
+    open_mrs = mr_parser.get_open_batcher_mrs()
     assert len(open_mrs) == 0
-    vcs.close_app_interface_mr.assert_has_calls(expected_calls)  # type: ignore[attr-defined]
+    vcs.close_app_interface_mr.assert_has_calls(expected_calls, any_order=True)  # type: ignore[attr-defined]
     assert vcs.close_app_interface_mr.call_count == len(expected_calls)  # type: ignore[attr-defined]
 
 
@@ -283,6 +319,7 @@ def test_remove_duplicates(
                     {CHANNELS_REF}: some_channel
                     {CONTENT_HASHES}: same_hash
                     {IS_BATCHABLE}: True
+                    {MR_KIND_REF}: {MRKind.BATCHER.value}
                 """,
             },
             {
@@ -294,6 +331,7 @@ def test_remove_duplicates(
                     {CHANNELS_REF}: some_channel
                     {CONTENT_HASHES}: same_hash
                     {IS_BATCHABLE}: True
+                    {MR_KIND_REF}: {MRKind.BATCHER.value}
                 """,
             },
         ]
@@ -301,7 +339,8 @@ def test_remove_duplicates(
     mr_parser = MRParser(
         vcs=vcs,
     )
-    open_mrs = mr_parser.retrieve_open_mrs(label=SAPM_LABEL)
+    mr_parser.fetch_mrs(label=SAPM_LABEL)
+    open_mrs = mr_parser.get_open_batcher_mrs()
     vcs.close_app_interface_mr.assert_has_calls([  # type: ignore[attr-defined]
         call(
             expected_mrs[1],

reconcile/test/saas_auto_promotions_manager/merge_request_manager/merge_request_manager/test_reconciler.py

@@ -4,16 +4,16 @@ from unittest.mock import create_autospec
 import pytest
 from gitlab.v4.objects import ProjectMergeRequest
 
-from reconcile.saas_auto_promotions_manager.merge_request_manager.mr_parser import (
-    OpenMergeRequest,
-)
-from reconcile.saas_auto_promotions_manager.merge_request_manager.reconciler import (
+from reconcile.saas_auto_promotions_manager.merge_request_manager.batcher import (
     Addition,
+    Batcher,
     Deletion,
     Diff,
     Promotion,
     Reason,
-    Reconciler,
+)
+from reconcile.saas_auto_promotions_manager.merge_request_manager.open_merge_requests import (
+    OpenBatcherMergeRequest,
 )
 
 
@@ -69,28 +69,28 @@ def _aggregate_channels(items: Sequence[Addition | Deletion]) -> set[str]:
         (
             [],
             [
-                OpenMergeRequest(
+                OpenBatcherMergeRequest(
                     raw=create_autospec(spec=ProjectMergeRequest),
                     channels={"chan1", "chan2"},
                     content_hashes={"hash1", "hash2"},
                     failed_mr_check=True,
                     is_batchable=True,
                 ),
-                OpenMergeRequest(
+                OpenBatcherMergeRequest(
                     raw=create_autospec(spec=ProjectMergeRequest),
                     channels={"chan3"},
                     content_hashes={"hash3"},
                     failed_mr_check=False,
                     is_batchable=True,
                 ),
-                OpenMergeRequest(
+                OpenBatcherMergeRequest(
                     raw=create_autospec(spec=ProjectMergeRequest),
                     channels={"chan4"},
                     content_hashes={"hash4"},
                     failed_mr_check=False,
                     is_batchable=False,
                 ),
-                OpenMergeRequest(
+                OpenBatcherMergeRequest(
                     raw=create_autospec(spec=ProjectMergeRequest),
                     channels={"chan5"},
                     content_hashes={"hash5"},
@@ -101,7 +101,7 @@ def _aggregate_channels(items: Sequence[Addition | Deletion]) -> set[str]:
             Diff(
                 deletions=[
                     Deletion(
-                        mr=OpenMergeRequest(
+                        mr=OpenBatcherMergeRequest(
                             raw=create_autospec(spec=ProjectMergeRequest),
                             channels={"chan1", "chan2"},
                             content_hashes={"hash1", "hash2"},
@@ -111,7 +111,7 @@ def _aggregate_channels(items: Sequence[Addition | Deletion]) -> set[str]:
                         reason=Reason.MISSING_UNBATCHING,
                     ),
                     Deletion(
-                        mr=OpenMergeRequest(
+                        mr=OpenBatcherMergeRequest(
                             raw=create_autospec(spec=ProjectMergeRequest),
                             channels={"chan3"},
                             content_hashes={"hash3"},
@@ -121,7 +121,7 @@ def _aggregate_channels(items: Sequence[Addition | Deletion]) -> set[str]:
                         reason=Reason.OUTDATED_CONTENT,
                     ),
                     Deletion(
-                        mr=OpenMergeRequest(
+                        mr=OpenBatcherMergeRequest(
                             raw=create_autospec(spec=ProjectMergeRequest),
                             channels={"chan4"},
                             content_hashes={"hash4"},
@@ -131,7 +131,7 @@ def _aggregate_channels(items: Sequence[Addition | Deletion]) -> set[str]:
                         reason=Reason.OUTDATED_CONTENT,
                     ),
                     Deletion(
-                        mr=OpenMergeRequest(
+                        mr=OpenBatcherMergeRequest(
                             raw=create_autospec(spec=ProjectMergeRequest),
                             channels={"chan5"},
                             content_hashes={"hash5"},
@@ -161,7 +161,7 @@ def _aggregate_channels(items: Sequence[Addition | Deletion]) -> set[str]:
                 ),
             ],
             [
-                OpenMergeRequest(
+                OpenBatcherMergeRequest(
                     raw=create_autospec(spec=ProjectMergeRequest),
                     channels={"chan1", "chan2"},
                     content_hashes={"hash1", "hash2"},
@@ -172,7 +172,7 @@ def _aggregate_channels(items: Sequence[Addition | Deletion]) -> set[str]:
             Diff(
                 deletions=[
                     Deletion(
-                        mr=OpenMergeRequest(
+                        mr=OpenBatcherMergeRequest(
                             raw=create_autospec(spec=ProjectMergeRequest),
                             channels={"chan1", "chan2"},
                             content_hashes={"hash1", "hash2"},
@@ -210,7 +210,7 @@ def _aggregate_channels(items: Sequence[Addition | Deletion]) -> set[str]:
                 ),
             ],
             [
-                OpenMergeRequest(
+                OpenBatcherMergeRequest(
                     raw=create_autospec(spec=ProjectMergeRequest),
                     channels={"chan1", "chan2"},
                     content_hashes={"hash1", "hash2"},
@@ -243,7 +243,7 @@ def _aggregate_channels(items: Sequence[Addition | Deletion]) -> set[str]:
                 ),
             ],
             [
-                OpenMergeRequest(
+                OpenBatcherMergeRequest(
                     raw=create_autospec(spec=ProjectMergeRequest),
                     channels={"chan1", "chan2"},
                     content_hashes={"hash1", "hash2"},
@@ -254,7 +254,7 @@ def _aggregate_channels(items: Sequence[Addition | Deletion]) -> set[str]:
             Diff(
                 deletions=[
                     Deletion(
-                        mr=OpenMergeRequest(
+                        mr=OpenBatcherMergeRequest(
                             raw=create_autospec(spec=ProjectMergeRequest),
                             channels={"chan1", "chan2"},
                             content_hashes={"hash1", "hash2"},
@@ -301,7 +301,7 @@ def _aggregate_channels(items: Sequence[Addition | Deletion]) -> set[str]:
                 ),
             ],
             [
-                OpenMergeRequest(
+                OpenBatcherMergeRequest(
                     raw=create_autospec(spec=ProjectMergeRequest),
                     channels={"chan1", "chan2"},
                     content_hashes={"hash1", "hash2"},
@@ -312,7 +312,7 @@ def _aggregate_channels(items: Sequence[Addition | Deletion]) -> set[str]:
             Diff(
                 deletions=[
                     Deletion(
-                        mr=OpenMergeRequest(
+                        mr=OpenBatcherMergeRequest(
                             raw=create_autospec(spec=ProjectMergeRequest),
                             channels={"chan1", "chan2"},
                             content_hashes={"hash1", "hash2"},
@@ -380,7 +380,7 @@ def _aggregate_channels(items: Sequence[Addition | Deletion]) -> set[str]:
                 ),
             ],
             [
-                OpenMergeRequest(
+                OpenBatcherMergeRequest(
                     raw=create_autospec(spec=ProjectMergeRequest),
                     channels={"chan1"},
                     content_hashes={"hash1"},
@@ -424,14 +424,14 @@ def _aggregate_channels(items: Sequence[Addition | Deletion]) -> set[str]:
                 ),
             ],
             [
-                OpenMergeRequest(
+                OpenBatcherMergeRequest(
                     raw=create_autospec(spec=ProjectMergeRequest),
                     channels={"chan1"},
                     content_hashes={"hash1"},
                     failed_mr_check=False,
                     is_batchable=False,
                 ),
-                OpenMergeRequest(
+                OpenBatcherMergeRequest(
                     raw=create_autospec(spec=ProjectMergeRequest),
                     channels={"chan2"},
                     content_hashes={"hash2"},
@@ -457,10 +457,10 @@ def _aggregate_channels(items: Sequence[Addition | Deletion]) -> set[str]:
 )
 def test_reconcile(
     desired_promotions: list[Promotion],
-    open_mrs: list[OpenMergeRequest],
+    open_mrs: list[OpenBatcherMergeRequest],
     expected_diff: Diff,
 ) -> None:
-    reconciler = Reconciler()
+    reconciler = Batcher()
     diff = reconciler.reconcile(
         desired_promotions=desired_promotions, open_mrs=open_mrs, batch_limit=5
     )

reconcile/test/saas_auto_promotions_manager/test_integration_test.py

@@ -1,15 +1,15 @@
 from unittest.mock import create_autospec
 
 from reconcile.saas_auto_promotions_manager.integration import SaasAutoPromotionsManager
+from reconcile.saas_auto_promotions_manager.merge_request_manager.batcher import (
+    Batcher,
+)
 from reconcile.saas_auto_promotions_manager.merge_request_manager.merge_request_manager_v2 import (
     MergeRequestManagerV2,
 )
 from reconcile.saas_auto_promotions_manager.merge_request_manager.mr_parser import (
     MRParser,
 )
-from reconcile.saas_auto_promotions_manager.merge_request_manager.reconciler import (
-    Reconciler,
-)
 from reconcile.saas_auto_promotions_manager.merge_request_manager.renderer import (
     Renderer,
 )
@@ -33,7 +33,7 @@ def test_integration_test():
     vcs = create_autospec(spec=VCS)
     merge_request_manager_v2 = MergeRequestManagerV2(
         vcs=vcs,
-        reconciler=create_autospec(spec=Reconciler),
+        reconciler=create_autospec(spec=Batcher),
         mr_parser=create_autospec(spec=MRParser),
         renderer=create_autospec(spec=Renderer),
     )