Merge ~emmabrostrom/ols-jenkaas:pre-merge-bot-comment into ols-jenkaas:main

[Emma Brostrom]

Re-introduce pre-merge refactor to exclude certain bot comments

The command was only looking at the most recent bot comment, regardless
of if it had to do with pre-merge CI, which this update fixes. Additionally,
refactored the function a bit to enhance readability and ease of list
comprehension. Update here to fix the issue with spamming bot comments when
tests failing also made - swapped out indexing for a more rigorous regex approach
when getting most recent bot comment commit hash.

Nearly identical to MP: https://code.launchpad.net/~emmabrostrom/ols-jenkaas/+git/ols-jenkaas/+merge/464033
Which was reverted here: https://code.launchpad.net/~emmabrostrom/ols-jenkaas/+git/ols-jenkaas/+merge/464146

Tested in ols-jenkaas VM on both failing and succeeding comments.

[Maximiliano Bertacchini (maxiberta)]

LGTM!

review: Approve

diff --git a/olsjenkaas/commands.py b/olsjenkaas/commands.py
index 9db0a23..971843a 100644
--- a/olsjenkaas/commands.py
+++ b/olsjenkaas/commands.py
@@ -814,24 +814,31 @@ class PreMergeGitProposals(Command):
             last_diffs_collection_index
         ].source_revision_id
         return most_recent_commit
+    
+    @staticmethod
+    def is_pre_merge_ci_comment_match(comment_body):
+        matches = re.findall(
+            r".*[pre-merge ci\w].*revision [0-9a-z]{40}",
+            comment_body,
+        )
+        return bool(matches)
 
     @staticmethod
     def get_most_recent_commit_seen_by_bot(proposal):
         comment_collection = proposal.all_comments
         bot_author_link = "https://api.launchpad.net/devel/~otto-copilot"
         bot_comments = [
-            comment
+            comment.message_body
             for comment in comment_collection
             if comment.author_link == bot_author_link
+            and PreMergeGitProposals.is_pre_merge_ci_comment_match(comment.message_body)
         ]
         try:
             most_recent_bot_comment = bot_comments[-1]
-            # Find revision number in last bot comment
-            matches = re.findall(
-                r".*[pre-merge ci\w].*revision [0-9a-z]{40}",
-                most_recent_bot_comment.message_body,
-            )
-            commit_hash = str(matches[0]).split()[-1]
+            commit_hash = re.findall(
+                r"[0-9a-z]{40}",
+                most_recent_bot_comment,
+            )[0]
             return commit_hash
         # If no bot comment or revision number found
         except IndexError: