qontract-reconcile 0.10.1rc495__py3-none-any.whl → 0.10.1rc497__py3-none-any.whl

{qontract_reconcile-0.10.1rc495.dist-info → qontract_reconcile-0.10.1rc497.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: qontract-reconcile
-Version: 0.10.1rc495
+Version: 0.10.1rc497
 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.1rc495.dist-info → qontract_reconcile-0.10.1rc497.dist-info}/RECORD

@@ -340,13 +340,13 @@ 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=1_e9LX-9oMHiuWPlQZ34WbsrxfW0IFANZtV_jXKW_PQ,5580
+reconcile/saas_auto_promotions_manager/integration.py,sha256=lRDMLekNMhPaMJFKS8e2ueK3EpYTC3T199uMoJck_zA,5503
 reconcile/saas_auto_promotions_manager/publisher.py,sha256=4_M9Oykhj-kEZPUn05E2DY5gD6-x32Dgf7K3NPOkGEg,2029
 reconcile/saas_auto_promotions_manager/subscriber.py,sha256=cLhPlkT71J2LIice3SLmH1WpsqzV46gd0peMxrnqyRw,7452
 reconcile/saas_auto_promotions_manager/merge_request_manager/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 reconcile/saas_auto_promotions_manager/merge_request_manager/merge_request.py,sha256=PNu7sE-tDUY61E03z5w0b93fdowZ8auCl0S4_vhYOKQ,1333
-reconcile/saas_auto_promotions_manager/merge_request_manager/merge_request_manager.py,sha256=rNyItd0fMxruxjlaP5yUmvv7di5ZGHVnqMjkvxSiI3c,10970
-reconcile/saas_auto_promotions_manager/merge_request_manager/renderer.py,sha256=bJfmrBaHkY5o5m56d-L8HNnVrOkBJqJ7yr14Do8yCuI,7088
+reconcile/saas_auto_promotions_manager/merge_request_manager/merge_request_manager.py,sha256=9boB6yp5Fin6XUCtNNsFVIOExi2o7IfbRbG9o1ZAe5Q,12797
+reconcile/saas_auto_promotions_manager/merge_request_manager/renderer.py,sha256=Sj3mwmBcml6t-49bPnXdq7snT9N0WKrPk2chU_0ylyE,7188
 reconcile/saas_auto_promotions_manager/utils/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 reconcile/saas_auto_promotions_manager/utils/saas_files_inventory.py,sha256=mihuWynroB1Cea1Lsvf6V8Nb8PGiBdcLC0uhCX_52Y0,6966
 reconcile/skupper_network/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -446,10 +446,10 @@ reconcile/test/saas_auto_promotions_manager/conftest.py,sha256=tZNs35EuWulP53Cqt
 reconcile/test/saas_auto_promotions_manager/test_integration_test.py,sha256=qip-D7a97VnX_-vvDdqJDXeyGDBSG2YvIjI3j7MY1hQ,3901
 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=oWDqepAOJ80VSlk_H0sMBUm0OLqJ3l0wEmg1jzVBS5U,3480
-reconcile/test/saas_auto_promotions_manager/merge_request_manager/merge_request_manager/data_keys.py,sha256=CTQc6Gesh0_8OGPip0SGamrrvFVa4Qo4pJzP-aNh4fE,496
-reconcile/test/saas_auto_promotions_manager/merge_request_manager/merge_request_manager/test_housekeeping.py,sha256=Yvt8G-j3Ual8RmlaE0M2LXHH44Av7QKIBg0ZJkv24eE,6114
-reconcile/test/saas_auto_promotions_manager/merge_request_manager/merge_request_manager/test_merge_request_manager.py,sha256=7jeN9WJADulxlwFS0G8-_Avzfw3NwyHMVIdEuGoVfOg,6279
+reconcile/test/saas_auto_promotions_manager/merge_request_manager/merge_request_manager/conftest.py,sha256=9N5M_uZn6GGbUDfqLkj9RarrKo_qUZVJDp26bH6m2Gw,3597
+reconcile/test/saas_auto_promotions_manager/merge_request_manager/merge_request_manager/data_keys.py,sha256=vkBpEBkx9mcYN4VkzijTJobfSUbgg5TxHOFpWbs0ztQ,535
+reconcile/test/saas_auto_promotions_manager/merge_request_manager/merge_request_manager/test_merge_request_manager.py,sha256=16QPUcg0TR1gXS_ELVcJ3frpYb9PBW55c6FRbS5i0y8,6078
+reconcile/test/saas_auto_promotions_manager/merge_request_manager/merge_request_manager/test_mr_parsing.py,sha256=HC-uyM3VVgA02Fkc0T0XE-eg47noyA9MB_gbKMeufh4,8829
 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=2rCSstewp4LPoEJHm5N7dGJexEtY8ndLHvoGZYjmpsc,1678
 reconcile/test/saas_auto_promotions_manager/merge_request_manager/renderer/data_keys.py,sha256=beHYQ9kgDLeBZgC2FvxQA3tHx1PO-RAMN8_kVcSdikI,90
@@ -576,7 +576,7 @@ reconcile/utils/throughput.py,sha256=iP4UWAe2LVhDo69mPPmgo9nQ7RxHD6_GS8MZe-aSiuM
 reconcile/utils/unleash.py,sha256=1D56CsZfE3ShDtN3IErE1T2eeIwNmxhK-yYbCotJ99E,3601
 reconcile/utils/vault.py,sha256=S0eHqvZ9N3fya1E8YDaUffEvLk_fdtpzL4rvWn6f828,14991
 reconcile/utils/vaultsecretref.py,sha256=3Ed2uBy36TzSvL0B-l4FoWQqB2SbBKDKEuUPIO608Bo,931
-reconcile/utils/vcs.py,sha256=ez0XB_0vo6RefgYDmz5YMvLytXtWsbLDJ56ffgVIBXw,5461
+reconcile/utils/vcs.py,sha256=o1r0n_IrU2El75CED_6sjR2GZGM-exuWsj5F7jONaMU,6779
 reconcile/utils/cloud_resource_best_practice/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 reconcile/utils/cloud_resource_best_practice/aws_rds.py,sha256=EvE6XKLsrZ531MJptKqPht2lOETrOjySTHXk6CzMgo0,2279
 reconcile/utils/glitchtip/__init__.py,sha256=FT6iBhGqoe7KExFdbgL8AYUb64iW_4snF5__Dcl7yt0,258
@@ -653,8 +653,8 @@ tools/test/test_app_interface_metrics_exporter.py,sha256=SX7qL3D1SIRKFo95FoQztvf
 tools/test/test_qontract_cli.py,sha256=d18KrdhtUGqoC7_kWZU128U0-VJEj-0rjFkLVufcI6I,2755
 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.1rc495.dist-info/METADATA,sha256=IASjtuTraWNInmz6oRgiIuZvIsTJLO9_vNcbr6Fqa44,2349
-qontract_reconcile-0.10.1rc495.dist-info/WHEEL,sha256=oiQVh_5PnQM0E3gPdiz09WCNmwiHDMaGer_elqB3coM,92
-qontract_reconcile-0.10.1rc495.dist-info/entry_points.txt,sha256=rTjAv28I_CHLM8ID3OPqMI_suoQ9s7tFbim4aYjn9kk,376
-qontract_reconcile-0.10.1rc495.dist-info/top_level.txt,sha256=l5ISPoXzt0SdR4jVdkfa7RPSKNc8zAHYWAnR-Dw8Ey8,24
-qontract_reconcile-0.10.1rc495.dist-info/RECORD,,
+qontract_reconcile-0.10.1rc497.dist-info/METADATA,sha256=IvyDujhOGuhQNFmCJDWvjg78ZPUpVBwcJwKlcVVWBlQ,2349
+qontract_reconcile-0.10.1rc497.dist-info/WHEEL,sha256=oiQVh_5PnQM0E3gPdiz09WCNmwiHDMaGer_elqB3coM,92
+qontract_reconcile-0.10.1rc497.dist-info/entry_points.txt,sha256=rTjAv28I_CHLM8ID3OPqMI_suoQ9s7tFbim4aYjn9kk,376
+qontract_reconcile-0.10.1rc497.dist-info/top_level.txt,sha256=l5ISPoXzt0SdR4jVdkfa7RPSKNc8zAHYWAnR-Dw8Ey8,24
+qontract_reconcile-0.10.1rc497.dist-info/RECORD,,

reconcile/saas_auto_promotions_manager/integration.py

@@ -81,7 +81,6 @@ class SaasAutoPromotionsManager:
         self._fetch_publisher_real_world_states()
         self._compute_desired_subscriber_states()
         subscribers_with_diff = self._get_subscribers_with_diff()
-        self._merge_request_manager.fetch_sapm_managed_open_merge_requests()
         self._merge_request_manager.housekeeping()
         self._merge_request_manager.create_promotion_merge_requests(
             subscribers=subscribers_with_diff

reconcile/saas_auto_promotions_manager/merge_request_manager/merge_request_manager.py

@@ -13,6 +13,7 @@ from reconcile.saas_auto_promotions_manager.merge_request_manager.merge_request
 from reconcile.saas_auto_promotions_manager.merge_request_manager.renderer import (
     CHANNELS_REF,
     CONTENT_HASHES,
+    IS_BATCHABLE,
     PROMOTION_DATA_SEPARATOR,
     SAPM_LABEL,
     SAPM_VERSION,
@@ -20,14 +21,18 @@ from reconcile.saas_auto_promotions_manager.merge_request_manager.renderer impor
     Renderer,
 )
 from reconcile.saas_auto_promotions_manager.subscriber import Subscriber
-from reconcile.utils.vcs import VCS
+from reconcile.utils.vcs import VCS, MRCheckStatus
+
+ITEM_SEPARATOR = ","
 
 
 @dataclass
 class OpenMergeRequest:
     raw: ProjectMergeRequest
-    content_hash: str
+    content_hashes: str
     channels: str
+    failed_mr_check: bool
+    is_batchable: bool
 
 
 class MergeRequestManager:
@@ -38,13 +43,10 @@ class MergeRequestManager:
 
     The idea is that for every channel combination there exists
     maximum one open MR in app-interface. I.e., all changes for
-    a channel combination are batched in a single MR. A content hash in the
-    description is used to identify the content of that MR. If a
-    channel combination receives new content before an already open MR
-    is merged, then the manager will first close the old MR and then
-    open a new MR with the new content. We might need to change this
-    batching approach in the future to have even less promotion MRs,
-    but for now this is sufficient.
+    a channel combination at a minumum are batched in a single MR.
+    The MR description is used to store current state for SAPM.
+    Channels can also be batched together into a single MR to reduce the overall
+    amount of MRs.
     """
 
     def __init__(self, vcs: VCS, renderer: Renderer):
@@ -53,6 +55,7 @@ class MergeRequestManager:
         self._version_ref_regex = re.compile(rf"{VERSION_REF}: (.*)$", re.MULTILINE)
         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._open_mrs: list[OpenMergeRequest] = []
         self._open_mrs_with_problems: list[OpenMergeRequest] = []
         self._open_raw_mrs: list[ProjectMergeRequest] = []
@@ -66,21 +69,22 @@ class MergeRequestManager:
             return ""
         return groups[0]
 
-    def fetch_sapm_managed_open_merge_requests(self) -> None:
+    def _fetch_sapm_managed_open_merge_requests(self) -> None:
         all_open_mrs = self._vcs.get_open_app_interface_merge_requests()
         self._open_raw_mrs = [
             mr for mr in all_open_mrs if SAPM_LABEL in mr.attributes.get("labels")
         ]
 
-    def housekeeping(self) -> None:
+    def _parse_raw_mrs(self) -> None:
         """
-        Close bad MRs:
-        - bad description format
-        - old SAPM version
-        - merge conflict
-
-        --> if we bump the SAPM version, we automatically close
-        old open MRs and replace them with new ones.
+        We store state in MR descriptions.
+        This function parses the state and stores a list 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
+        - CHANNELS
+        - CONTENT_HASHES
+        - IS_BATCHABLE flag
         """
         seen: set[tuple[str, str, str]] = set()
         for mr in self._open_raw_mrs:
@@ -134,10 +138,10 @@ class MergeRequestManager:
                 )
                 continue
 
-            content_hash = self._apply_regex(
+            content_hashes = self._apply_regex(
                 pattern=self._content_hash_regex, promotion_data=promotion_data
             )
-            if not content_hash:
+            if not content_hashes:
                 logging.info(
                     "Bad %s format. Closing %s",
                     CONTENT_HASHES,
@@ -148,10 +152,10 @@ class MergeRequestManager:
                 )
                 continue
 
-            channels_ref = self._apply_regex(
+            channels_refs = self._apply_regex(
                 pattern=self._channels_regex, promotion_data=promotion_data
             )
-            if not channels_ref:
+            if not channels_refs:
                 logging.info(
                     "Bad %s format. Closing %s",
                     CHANNELS_REF,
@@ -162,7 +166,7 @@ class MergeRequestManager:
                 )
                 continue
 
-            key = (version_ref, channels_ref, content_hash)
+            key = (version_ref, channels_refs, content_hashes)
             if key in seen:
                 logging.info(
                     "Duplicate MR detected. Closing %s",
@@ -175,14 +179,49 @@ class MergeRequestManager:
                 continue
             seen.add(key)
 
+            is_batchable_str = self._apply_regex(
+                pattern=self._is_batchable_regex, promotion_data=promotion_data
+            )
+            if is_batchable_str not in set(["True", "False"]):
+                logging.info(
+                    "Bad %s format. Closing %s",
+                    IS_BATCHABLE,
+                    mr.attributes.get("web_url", "NO_WEBURL"),
+                )
+                self._vcs.close_app_interface_mr(
+                    mr, f"Closing this MR because of bad {IS_BATCHABLE} format."
+                )
+                continue
+
+            mr_check_status = self._vcs.get_gitlab_mr_check_status(mr)
+
             self._open_mrs.append(
                 OpenMergeRequest(
                     raw=mr,
-                    content_hash=content_hash,
-                    channels=channels_ref,
+                    content_hashes=content_hashes,
+                    channels=channels_refs,
+                    failed_mr_check=mr_check_status == MRCheckStatus.FAILED,
+                    is_batchable=bool(is_batchable_str),
                 )
             )
 
+    def _unbatch_failed_mrs(self) -> None:
+        """
+        We optimistically batch MRs together that didnt run through MR check yet.
+        Vast majority of auto-promotion MRs are succeeding checks, so we can stay optimistic.
+        In the rare case of an MR failing the check, we want to unbatch it.
+        I.e., we open a dedicated MR for each channel in the batched MR, mark the new MRs as non-batchable
+        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.
+        """
+        # TODO: implemented in follow-up MR
+        pass
+
+    def housekeeping(self) -> None:
+        self._fetch_sapm_managed_open_merge_requests()
+        self._parse_raw_mrs()
+        self._unbatch_failed_mrs()
+
     def _aggregate_subscribers_per_channel_combo(
         self, subscribers: Iterable[Subscriber]
     ) -> dict[str, list[Subscriber]]:
@@ -196,7 +235,7 @@ class MergeRequestManager:
         return any(
             True
             for mr in self._open_mrs
-            if content_hash in mr.content_hash and channels in mr.channels
+            if content_hash in mr.content_hashes and channels in mr.channels
         )
 
     def create_promotion_merge_requests(
@@ -223,7 +262,7 @@ class MergeRequestManager:
             for mr in self._open_mrs:
                 if channel_combo not in mr.channels:
                     continue
-                if combined_content_hash not in mr.content_hash:
+                if combined_content_hash not in mr.content_hashes:
                     logging.info(
                         "Closing MR %s because it has out-dated content",
                         mr.raw.attributes.get("web_url", "NO_WEBURL"),
@@ -261,8 +300,9 @@ class MergeRequestManager:
                 continue
 
             description = self._renderer.render_description(
-                content_hash=combined_content_hash,
+                content_hashes=combined_content_hash,
                 channels=channel_combo,
+                is_batchable=True,
             )
             title = self._renderer.render_title(channels=channel_combo)
             logging.info(

reconcile/saas_auto_promotions_manager/merge_request_manager/renderer.py

@@ -22,6 +22,7 @@ SAPM_VERSION = "1.1.0"
 SAPM_LABEL = "SAPM"
 CONTENT_HASHES = "content_hashes"
 CHANNELS_REF = "channels"
+IS_BATCHABLE = "is_batchable"
 VERSION_REF = "sapm_version"
 SAPM_DESC = f"""
 This is an auto-promotion triggered by app-interface's [saas-auto-promotions-manager](https://github.com/app-sre/qontract-reconcile/tree/master/reconcile/saas_auto_promotions_manager) (SAPM).
@@ -134,7 +135,9 @@ class Renderer:
             new_content += stream.getvalue() or ""
         return new_content
 
-    def render_description(self, content_hash: str, channels: str) -> str:
+    def render_description(
+        self, content_hashes: str, channels: str, is_batchable: bool
+    ) -> str:
         return f"""
 {SAPM_DESC}
 
@@ -142,7 +145,9 @@ class Renderer:
 
 {CHANNELS_REF}: {channels}
 
-{CONTENT_HASHES}: {content_hash}
+{CONTENT_HASHES}: {content_hashes}
+
+{IS_BATCHABLE}: {is_batchable}
 
 {VERSION_REF}: {SAPM_VERSION}
         """

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

@@ -13,6 +13,7 @@ from reconcile.gql_definitions.fragments.saas_target_namespace import (
 from reconcile.saas_auto_promotions_manager.merge_request_manager.renderer import (
     CHANNELS_REF,
     CONTENT_HASHES,
+    IS_BATCHABLE,
     PROMOTION_DATA_SEPARATOR,
     SAPM_LABEL,
     SAPM_VERSION,
@@ -30,6 +31,7 @@ from .data_keys import (
     HAS_CONFLICTS,
     LABELS,
     OPEN_MERGE_REQUESTS,
+    SUBSCRIBER_BATCHABLE,
     SUBSCRIBER_CHANNELS,
     SUBSCRIBER_CONTENT_HASH,
     SUBSCRIBER_DESIRED_CONFIG_HASHES,
@@ -52,6 +54,7 @@ def mr_builder() -> Callable[[Mapping], ProjectMergeRequest]:
                 {VERSION_REF}: {data.get(VERSION_REF, SAPM_VERSION)}
                 {CHANNELS_REF}: {data.get(SUBSCRIBER_CHANNELS, "some_channel")}
                 {CONTENT_HASHES}: {data.get(SUBSCRIBER_CONTENT_HASH, "content_hash")}
+                {IS_BATCHABLE}: {data.get(SUBSCRIBER_BATCHABLE, "True")}
                 """,
                 "web_url": "http://localhost",
                 "has_conflicts": False,

reconcile/test/saas_auto_promotions_manager/merge_request_manager/merge_request_manager/data_keys.py

@@ -10,5 +10,6 @@ SUBSCRIBER_TARGET_PATH = "target_path"
 SUBSCRIBER_DESIRED_CONFIG_HASHES = "config_hashes"
 SUBSCRIBER_DESIRED_REF = "desired_ref"
 SUBSCRIBER_CHANNELS = "sub_channels"
+SUBSCRIBER_BATCHABLE = "sub_batchable"
 HAS_CONFLICTS = "has_conflicts"
 SUBSCRIBER_TARGET_NAMESPACE = "subscriber_target_namespace"

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

@@ -53,7 +53,6 @@ def test_close_old_content(
         vcs=vcs,
         renderer=renderer,
     )
-    merge_request_manager.fetch_sapm_managed_open_merge_requests()
     merge_request_manager.housekeeping()
     merge_request_manager.create_promotion_merge_requests(subscribers=subscribers)
 
@@ -112,7 +111,6 @@ def test_merge_request_already_opened(
         vcs=vcs,
         renderer=renderer,
     )
-    merge_request_manager.fetch_sapm_managed_open_merge_requests()
     merge_request_manager.housekeeping()
     merge_request_manager.create_promotion_merge_requests(subscribers=subscribers)
 
@@ -170,7 +168,6 @@ def test_ignore_unrelated_channels(
         vcs=vcs,
         renderer=renderer,
     )
-    merge_request_manager.fetch_sapm_managed_open_merge_requests()
     merge_request_manager.housekeeping()
     merge_request_manager.create_promotion_merge_requests(subscribers=subscribers)
 

reconcile/test/saas_auto_promotions_manager/merge_request_manager/merge_request_manager/{test_housekeeping.py → test_mr_parsing.py}

@@ -9,6 +9,7 @@ from reconcile.saas_auto_promotions_manager.merge_request_manager.merge_request_
 from reconcile.saas_auto_promotions_manager.merge_request_manager.renderer import (
     CHANNELS_REF,
     CONTENT_HASHES,
+    IS_BATCHABLE,
     PROMOTION_DATA_SEPARATOR,
     SAPM_LABEL,
     SAPM_VERSION,
@@ -25,16 +26,30 @@ from .data_keys import (
 )
 
 
-def test_labels_filter(vcs_builder: Callable[[Mapping], VCS], renderer: Renderer):
+def test_labels_filter(
+    vcs_builder: Callable[[Mapping], VCS], renderer: Renderer
+) -> None:
     vcs = vcs_builder({
         OPEN_MERGE_REQUESTS: [
             {
                 LABELS: ["OtherLabel"],
-                DESCRIPTION: "Some desc",
+                DESCRIPTION: f"""
+                    Blabla
+                    {PROMOTION_DATA_SEPARATOR}
+                    {VERSION_REF}: {SAPM_VERSION}
+                    {CHANNELS_REF}: some-channel
+                    {CONTENT_HASHES}: some_hash
+                """,
             },
             {
                 LABELS: [SAPM_LABEL, "OtherLabel"],
-                DESCRIPTION: "Some desc",
+                DESCRIPTION: f"""
+                    Blabla
+                    {PROMOTION_DATA_SEPARATOR}
+                    {VERSION_REF}: {SAPM_VERSION}
+                    {CHANNELS_REF}: other-channel
+                    {CONTENT_HASHES}: other_hash
+                """,
             },
         ]
     })
@@ -42,11 +57,13 @@ def test_labels_filter(vcs_builder: Callable[[Mapping], VCS], renderer: Renderer
         vcs=vcs,
         renderer=renderer,
     )
-    merge_request_manager.fetch_sapm_managed_open_merge_requests()
+    merge_request_manager.housekeeping()
     assert len(merge_request_manager._open_raw_mrs) == 1
 
 
-def test_valid_description(vcs_builder: Callable[[Mapping], VCS], renderer: Renderer):
+def test_valid_description(
+    vcs_builder: Callable[[Mapping], VCS], renderer: Renderer
+) -> None:
     vcs = vcs_builder({
         OPEN_MERGE_REQUESTS: [
             {
@@ -57,6 +74,7 @@ def test_valid_description(vcs_builder: Callable[[Mapping], VCS], renderer: Rend
                     {VERSION_REF}: {SAPM_VERSION}
                     {CHANNELS_REF}: some-channel
                     {CONTENT_HASHES}: some_hash
+                    {IS_BATCHABLE}: True
                 """,
             }
         ]
@@ -65,13 +83,50 @@ def test_valid_description(vcs_builder: Callable[[Mapping], VCS], renderer: Rend
         vcs=vcs,
         renderer=renderer,
     )
-    merge_request_manager.fetch_sapm_managed_open_merge_requests()
     merge_request_manager.housekeeping()
     vcs.close_app_interface_mr.assert_not_called()  # type: ignore[attr-defined]
     assert len(merge_request_manager._open_mrs) == 1
 
 
-def test_bad_mrs(vcs_builder: Callable[[Mapping], VCS], renderer: Renderer):
+def test_valid_batching(
+    vcs_builder: Callable[[Mapping], VCS], renderer: Renderer
+) -> None:
+    vcs = vcs_builder({
+        OPEN_MERGE_REQUESTS: [
+            {
+                LABELS: [SAPM_LABEL],
+                DESCRIPTION: f"""
+                    Blabla
+                    {PROMOTION_DATA_SEPARATOR}
+                    {VERSION_REF}: {SAPM_VERSION}
+                    {CHANNELS_REF}: some-channel
+                    {CONTENT_HASHES}: some_hash
+                    {IS_BATCHABLE}: False
+                """,
+            },
+            {
+                LABELS: [SAPM_LABEL],
+                DESCRIPTION: f"""
+                    Blabla
+                    {PROMOTION_DATA_SEPARATOR}
+                    {VERSION_REF}: {SAPM_VERSION}
+                    {CHANNELS_REF}: other-channel
+                    {CONTENT_HASHES}: other_hash
+                    {IS_BATCHABLE}: True
+                """,
+            },
+        ]
+    })
+    merge_request_manager = MergeRequestManager(
+        vcs=vcs,
+        renderer=renderer,
+    )
+    merge_request_manager.housekeeping()
+    vcs.close_app_interface_mr.assert_not_called()  # type: ignore[attr-defined]
+    assert len(merge_request_manager._open_mrs) == 2
+
+
+def test_bad_mrs(vcs_builder: Callable[[Mapping], VCS], renderer: Renderer) -> None:
     vcs = vcs_builder({
         OPEN_MERGE_REQUESTS: [
             {
@@ -82,6 +137,7 @@ def test_bad_mrs(vcs_builder: Callable[[Mapping], VCS], renderer: Renderer):
                     missing-version: some_version
                     {CHANNELS_REF}: some-channel
                     {CONTENT_HASHES}: hash_1
+                    {IS_BATCHABLE}: True
                 """,
             },
             {
@@ -91,6 +147,7 @@ def test_bad_mrs(vcs_builder: Callable[[Mapping], VCS], renderer: Renderer):
                     {PROMOTION_DATA_SEPARATOR}
                     {VERSION_REF}: {SAPM_VERSION}
                     {CHANNELS_REF}: some-channel
+                    {IS_BATCHABLE}: True
                     missing-content-hash-key: some_hash
                 """,
             },
@@ -101,6 +158,7 @@ def test_bad_mrs(vcs_builder: Callable[[Mapping], VCS], renderer: Renderer):
                     missing-data-separator
                     {VERSION_REF}: {SAPM_VERSION}
                     {CONTENT_HASHES}: hash_3
+                    {IS_BATCHABLE}: True
                 """,
             },
             {
@@ -111,6 +169,7 @@ def test_bad_mrs(vcs_builder: Callable[[Mapping], VCS], renderer: Renderer):
                     {PROMOTION_DATA_SEPARATOR}
                     {CHANNELS_REF}: some-channel
                     {CONTENT_HASHES}: hash_4
+                    {IS_BATCHABLE}: True
                 """,
             },
             {
@@ -123,6 +182,7 @@ def test_bad_mrs(vcs_builder: Callable[[Mapping], VCS], renderer: Renderer):
                     {VERSION_REF}: {SAPM_VERSION}
                     {CHANNELS_REF}: some-channel
                     {CONTENT_HASHES}: hash_5
+                    {IS_BATCHABLE}: True
                 """,
             },
             {
@@ -133,6 +193,7 @@ def test_bad_mrs(vcs_builder: Callable[[Mapping], VCS], renderer: Renderer):
                     {VERSION_REF}: outdated-version
                     {CHANNELS_REF}: some-channel
                     {CONTENT_HASHES}: hash_6
+                    {IS_BATCHABLE}: True
                 """,
             },
             {
@@ -143,6 +204,29 @@ def test_bad_mrs(vcs_builder: Callable[[Mapping], VCS], renderer: Renderer):
                     {VERSION_REF}: {SAPM_VERSION}
                     bad_channel_ref: some-channel
                     {CONTENT_HASHES}: hash_7
+                    {IS_BATCHABLE}: True
+                """,
+            },
+            {
+                LABELS: [SAPM_LABEL],
+                DESCRIPTION: f"""
+                    Blabla
+                    {PROMOTION_DATA_SEPARATOR}
+                    {VERSION_REF}: {SAPM_VERSION}
+                    {CHANNELS_REF}: some-channel
+                    {CONTENT_HASHES}: hash_8
+                    missing-batchable-key
+                """,
+            },
+            {
+                LABELS: [SAPM_LABEL],
+                DESCRIPTION: f"""
+                    Blabla
+                    {PROMOTION_DATA_SEPARATOR}
+                    {VERSION_REF}: {SAPM_VERSION}
+                    {CHANNELS_REF}: some-channel
+                    {CONTENT_HASHES}: hash_9
+                    {IS_BATCHABLE}: Something-non-bool
                 """,
             },
         ]
@@ -151,13 +235,14 @@ def test_bad_mrs(vcs_builder: Callable[[Mapping], VCS], renderer: Renderer):
         vcs=vcs,
         renderer=renderer,
     )
-    merge_request_manager.fetch_sapm_managed_open_merge_requests()
     merge_request_manager.housekeeping()
     vcs.close_app_interface_mr.assert_called()  # type: ignore[attr-defined]
     assert len(merge_request_manager._open_mrs) == 0
 
 
-def test_remove_duplicates(vcs_builder: Callable[[Mapping], VCS], renderer: Renderer):
+def test_remove_duplicates(
+    vcs_builder: Callable[[Mapping], VCS], renderer: Renderer
+) -> None:
     vcs = vcs_builder({
         OPEN_MERGE_REQUESTS: [
             {
@@ -168,6 +253,7 @@ def test_remove_duplicates(vcs_builder: Callable[[Mapping], VCS], renderer: Rend
                     {VERSION_REF}: {SAPM_VERSION}
                     {CHANNELS_REF}: some_channel
                     {CONTENT_HASHES}: same_hash
+                    {IS_BATCHABLE}: True
                 """,
             },
             {
@@ -178,6 +264,7 @@ def test_remove_duplicates(vcs_builder: Callable[[Mapping], VCS], renderer: Rend
                     {VERSION_REF}: {SAPM_VERSION}
                     {CHANNELS_REF}: some_channel
                     {CONTENT_HASHES}: same_hash
+                    {IS_BATCHABLE}: True
                 """,
             },
         ]
@@ -186,7 +273,6 @@ def test_remove_duplicates(vcs_builder: Callable[[Mapping], VCS], renderer: Rend
         vcs=vcs,
         renderer=renderer,
     )
-    merge_request_manager.fetch_sapm_managed_open_merge_requests()
     merge_request_manager.housekeeping()
     vcs.close_app_interface_mr.assert_called_once()  # type: ignore[attr-defined]
     assert len(merge_request_manager._open_mrs) == 1

reconcile/utils/vcs.py

@@ -1,6 +1,9 @@
+from __future__ import annotations
+
 import logging
 import re
 from collections.abc import Iterable
+from enum import Enum
 from typing import Optional
 
 from gitlab.v4.objects import ProjectMergeRequest
@@ -19,6 +22,13 @@ from reconcile.utils.secret_reader import (
 )
 
 
+class MRCheckStatus(Enum):
+    NONE = 0
+    SUCCESS = 1
+    FAILED = 2
+    RUNNING = 3
+
+
 class VCS:
     """
     Abstraction layer for aggregating different Version Control Systems.
@@ -38,17 +48,32 @@ class VCS:
         dry_run: bool,
         allow_deleting_mrs: bool,
         allow_opening_mrs: bool,
+        gitlab_instance: Optional[GitLabApi] = None,
+        default_gh_token: Optional[str] = None,
+        app_interface_api: Optional[GitLabApi] = None,
     ):
         self._dry_run = dry_run
         self._allow_deleting_mrs = allow_deleting_mrs
         self._allow_opening_mrs = allow_opening_mrs
         self._secret_reader = secret_reader
         self._gh_per_repo_url: dict[str, GithubRepositoryApi] = {}
-        self._default_gh_token = self._get_default_gh_token(github_orgs=github_orgs)
-        self._gitlab_instance = self._gitlab_api(gitlab_instances=gitlab_instances)
-        self._app_interface_api = self._init_app_interface_api(
-            gitlab_instances=gitlab_instances,
-            app_interface_repo_url=app_interface_repo_url,
+        self._default_gh_token = (
+            default_gh_token
+            if default_gh_token
+            else self._get_default_gh_token(github_orgs=github_orgs)
+        )
+        self._gitlab_instance = (
+            gitlab_instance
+            if gitlab_instance
+            else self._gitlab_api(gitlab_instances=gitlab_instances)
+        )
+        self._app_interface_api = (
+            app_interface_api
+            if app_interface_api
+            else self._init_app_interface_api(
+                gitlab_instances=gitlab_instances,
+                app_interface_repo_url=app_interface_repo_url,
+            )
         )
         self._is_commit_sha_regex = re.compile(r"^[0-9a-f]{40}$")
 
@@ -104,6 +129,23 @@ class VCS:
             project_url=app_interface_repo_url,
         )
 
+    def get_gitlab_mr_check_status(self, mr: ProjectMergeRequest) -> MRCheckStatus:
+        pipelines = self._gitlab_instance.get_merge_request_pipelines(mr)
+        if not pipelines:
+            return MRCheckStatus.NONE
+        # available status codes https://docs.gitlab.com/ee/api/pipelines.html
+        last_pipeline_result = pipelines[0]["status"]
+        match last_pipeline_result:
+            case "success":
+                return MRCheckStatus.SUCCESS
+            case "running":
+                return MRCheckStatus.RUNNING
+            case "failed":
+                return MRCheckStatus.FAILED
+            case _:
+                # Lets assume all other states as non-present
+                return MRCheckStatus.NONE
+
     def get_commit_sha(
         self, repo_url: str, ref: str, auth_code: Optional[HasSecret]
     ) -> str: