From 7f900322ed746e21c23a5907586181c2001e43d5 Mon Sep 17 00:00:00 2001
From: Tim Flink <tflink@fedoraproject.org>
Date: Oct 31 2016 20:50:45 +0000
Subject: being more selective on the koji tags we trigger on. Fixes T862


Summary: there are now '*-signing-pending' tags in koji which we shouldn't be triggering on. make the logic more picky on what gets through and what doesn't so that we're not triggering on invalid tags. Fixes T862

Differential Revision: https://phab.qadevel.cloud.fedoraproject.org/D1042

---

diff --git a/jobtriggers/koji_tag_msg.py b/jobtriggers/koji_tag_msg.py
index 1837187..85a1091 100644
--- a/jobtriggers/koji_tag_msg.py
+++ b/jobtriggers/koji_tag_msg.py
@@ -20,8 +20,9 @@ def get_item(msg):
         raise exc.TriggerMsgError('rejecting message not from primary koji instance (%s from %s)'
                                   % (koji_tag, instance))
 
-    if not koji_tag.endswith('pending'):
-        raise exc.TriggerMsgError('rejecting message for not being a pending tag (%s)' % koji_tag)
+    if not re.match('.*-updates(-testing)?-pending', koji_tag):
+        raise exc.TriggerMsgError('rejecting message for not being an updates-(testing?)-pending',
+                                  'tag (%s)' % koji_tag)
 
     m = re.match(r'^f\d\d-.*', koji_tag)
     if m is None:
diff --git a/testing/test_koji_tag_trigger.py b/testing/test_koji_tag_trigger.py
index 80a2e9a..902df26 100644
--- a/testing/test_koji_tag_trigger.py
+++ b/testing/test_koji_tag_trigger.py
@@ -152,10 +152,24 @@ class TestKojiTagChangedJobTrigger():
 
     def test_consume_allowed_release(self):
         ref_release = '3.fc20.1'
-        ref_tag = 'f20-testing-pending'
+        ref_tag = 'f20-updates-testing-pending'
         self._create_msg(
             self.ref_instance, self.ref_name, ref_release, ref_tag, self.ref_version)
 
         self.helper.consume(self.ref_message)
 
         assert self.helper.queued_tags == set([ref_tag])
+
+    def test_ignore_signing_tags(self):
+        ''' Now that there are *-signing-pending tags in koji, we need to be more selective about
+        what we're triggering on
+        '''
+
+        ref_release = '3.fc20.1'
+        ref_tag = 'f20-signing-pending'
+        self._create_msg(
+            self.ref_instance, self.ref_name, ref_release, ref_tag, self.ref_version)
+
+        self.helper.consume(self.ref_message)
+
+        assert self.helper.queued_tags == set([])