Merge pull request #2691 from ashwindasr/add-mr-approvers-support

Add MR approval rules automation from group.yml mr_approvers

Author: openshift-merge-bot[bot]

artcommon/artcommonlib/gitlab.py

@@ -107,6 +107,69 @@ async def set_mr_ready(self, mr_url: str):
             logger.info("MR is already ready (no draft prefix found)")
             return mr
 
+    def _resolve_user_ids(self, usernames: list[str]) -> list[int]:
+        """
+        Resolve GitLab usernames to user IDs.
+
+        Arg(s):
+            usernames: List of GitLab usernames
+        Return Value(s):
+            List of resolved user IDs (skips unresolved usernames with a warning)
+        """
+        user_ids = []
+        for username in usernames:
+            users = self._client.users.list(username=username)
+            if users:
+                user_ids.append(users[0].id)
+            else:
+                logger.warning(f"Could not resolve GitLab username: {username}")
+        return user_ids
+
+    async def set_mr_approval_rules(self, mr_url: str, approvers_config: dict[str, list[str]]):
+        """
+        Configure MR-level approval rules based on group.yml mr_approvers config.
+        Keeps the "ART" rule, removes all other inherited rules, and creates new
+        rules from approvers_config.
+
+        Arg(s):
+            mr_url: Full URL to the merge request
+            approvers_config: Dict mapping approval group names to lists of GitLab usernames,
+                              e.g. {"QE": ["user1", "user2"]}
+        """
+        if not mr_url or not approvers_config:
+            return
+
+        if self.dry_run:
+            for name, usernames in approvers_config.items():
+                logger.info(f"[DRY-RUN] Would create approval rule '{name}' with users: {usernames}")
+            return
+
+        mr = self.get_mr_from_url(mr_url)
+        if not mr:
+            logger.error(f"Could not retrieve MR from URL: {mr_url}")
+            return
+
+        existing_rules = mr.approval_rules.list()
+
+        for rule in existing_rules:
+            if rule.name != "ART":
+                logger.info(f"Deleting approval rule '{rule.name}' (id={rule.id})")
+                rule.delete()
+
+        for name, usernames in approvers_config.items():
+            user_ids = self._resolve_user_ids(usernames)
+            if not user_ids:
+                logger.warning(f"No valid user IDs resolved for approval rule '{name}', skipping")
+                continue
+            mr.approval_rules.create(
+                {
+                    "name": name,
+                    "approvals_required": 1,
+                    "user_ids": user_ids,
+                }
+            )
+            logger.info(f"Created approval rule '{name}' with users: {usernames} (ids: {user_ids})")
+
     async def trigger_ci_pipeline(self, mr) -> str | None:
         """
         Trigger a GitLab Merge Request pipeline using the MR API.

ocp-build-data-validator/validator/json_schemas/assembly_group_config.schema.json

@@ -558,7 +558,14 @@
     "csv_namespace": {"type": "string"},
     "software_lifecycle": {"type": "object"},
     "external_scanners": {"type": "object"},
-    "reconciliation_prs": {"type": "object"}
+    "reconciliation_prs": {"type": "object"},
+    "mr_approvers": {
+      "type": "object",
+      "additionalProperties": {
+        "type": "array",
+        "items": {"type": "string"}
+      }
+    }
   },
   "additionalProperties": false
 }

pyartcd/pyartcd/pipelines/release_from_fbc.py

@@ -249,6 +249,26 @@ async def _load_product_from_group_config(self) -> str:
         self.logger.info(f"Using product extracted from group name: {product}")
         return product
 
+    async def _load_mr_approvers_from_group_config(self) -> dict[str, list[str]]:
+        """
+        Load the mr_approvers field from group configuration using doozer command.
+        Returns a dict mapping approval group names to lists of GitLab usernames,
+        e.g. {"QE": ["user1", "user2"]}. Returns empty dict if not configured.
+        """
+        try:
+            cmd = ['doozer', f'--group={self.group}', 'config:read-group', 'mr_approvers']
+            _, output, _ = await exectools.cmd_gather_async(cmd)
+            output = output.strip()
+            if output and output not in ('None', 'null'):
+                parsed = stdlib_yaml.safe_load(output)
+                if not isinstance(parsed, dict):
+                    self.logger.warning("mr_approvers is not a dict (got %s), ignoring", type(parsed).__name__)
+                    return {}
+                return parsed
+        except Exception as e:
+            self.logger.warning(f"Failed to load mr_approvers from group config: {e}")
+        return {}
+
     async def extract_fbc_labels(self, fbc_pullspec: str) -> Dict[str, Optional[str]]:
         """
         Extract both the NVR and __doozer_key labels from the FBC image.
@@ -602,6 +622,17 @@ async def create_shipment_mr(self, shipments_by_kind: Dict[str, ShipmentConfig],
             mr_url = mr.web_url
             self.logger.info("Created Merge Request: %s", mr_url)
 
+        # Configure approval rules from group.yml if defined
+        approvers_config = await self._load_mr_approvers_from_group_config()
+        if approvers_config:
+            if self.dry_run:
+                self.logger.info("[DRY-RUN] Would set MR approval rules: %s", approvers_config)
+            else:
+                try:
+                    await self._gitlab.set_mr_approval_rules(mr_url, approvers_config)
+                except Exception as e:
+                    self.logger.warning(f"Failed to set MR approval rules: {e}")
+
         # Store the MR URL for later use
         self.shipment_mr_url = mr_url
         return mr_url