From 741aa6581cd0418b16c743ba07aa60a7bcfe9424 Mon Sep 17 00:00:00 2001 From: Ashwin Das Date: Fri, 12 Jan 2024 14:11:58 -0500 Subject: [PATCH] skip verify-flaws for preview and prerelease --- pyartcd/pyartcd/pipelines/promote.py | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/pyartcd/pyartcd/pipelines/promote.py b/pyartcd/pyartcd/pipelines/promote.py index bda27a7a5..98041e0da 100644 --- a/pyartcd/pyartcd/pipelines/promote.py +++ b/pyartcd/pyartcd/pipelines/promote.py @@ -255,8 +255,13 @@ async def run(self): # logger.info("%s is GA'd. Blocking Bug check will be enforced.", next_minor) logger.info("Verifying attached bugs...") advisories = list(filter(lambda ad: ad > 0, impetus_advisories.values())) + + verify_flaws = True + if "prerelease" in impetus_advisories.keys() or assembly_type == assembly.AssemblyTypes.PREVIEW: + verify_flaws = False try: - await self.verify_attached_bugs(advisories, no_verify_blocking_bugs=no_verify_blocking_bugs) + await self.verify_attached_bugs(advisories, no_verify_blocking_bugs=no_verify_blocking_bugs, + verify_flaws=verify_flaws) except ChildProcessError as err: logger.warn("Error verifying attached bugs: %s", err) justification = self._reraise_if_not_permitted(err, "ATTACHED_BUGS", permits) @@ -881,7 +886,8 @@ def verify_advisory_status(self, advisory_info: Dict): if advisory_info["status"] not in {"QE", "REL_PREP", "PUSH_READY", "IN_PUSH", "SHIPPED_LIVE"}: raise VerificationError(f"Advisory {advisory_info['id']} should not be in {advisory_info['status']} state.") - async def verify_attached_bugs(self, advisories: Iterable[int], no_verify_blocking_bugs: bool): + async def verify_attached_bugs(self, advisories: Iterable[int], no_verify_blocking_bugs: bool, + verify_flaws: bool = True): advisories = list(advisories) if not advisories: self._logger.warning("No advisories to verify.") @@ -890,9 +896,10 @@ async def verify_attached_bugs(self, advisories: Iterable[int], no_verify_blocki "elliott", f"--assembly={self.assembly}", f"--group={self.group}", - "verify-attached-bugs", - "--verify-flaws" + "verify-attached-bugs" ] + if verify_flaws: + cmd.append("--verify-flaws") if no_verify_blocking_bugs: cmd.append("--no-verify-blocking-bugs") async with self._elliott_lock: