commit 237f3efeddd112777bb3ccaf91f3c7f32efa70e9
author LaMont Jones <lamontjones@chromium.org> Wed Jan 22 10:40:52 2020 -0700
committer Commit Bot <commit-bot@chromium.org> Wed Jan 22 19:11:39 2020 +0000
tree eb1f8d2fc3d532af5e1bb36c5e42704ccab71ca6
parent 5aae3f78992b7b2dd9b19a6899c9220bd8011a70

Allow Cq-Cl-Tag to follow Change-Id.

PUpr CLs have this tag.

BUG=chromium:1039875
TEST=tryjob

Change-Id: Ia95312296a5bf31de64834631a7351e37d1e6540
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/repohooks/+/2015129
Reviewed-by: George Engelbrecht <engeg@google.com>
Reviewed-by: Will Bradley <wbbradley@chromium.org>
Tested-by: LaMont Jones <lamontjones@chromium.org>
Commit-Queue: LaMont Jones <lamontjones@chromium.org>

pre-upload.py

diff --git a/pre-upload.py b/pre-upload.py
index a2ab332..d65946d 100755
--- a/pre-upload.py
+++ b/pre-upload.py
@@ -741,6 +741,7 @@
       'Suggested-by',
       'Reported-by',
       'Acked-for-chrome-by',
+      'Cq-Cl-Tag',
   }
 
   # Ignore tags, which could reasonably contain OEM names
@@ -1180,7 +1181,7 @@
     return HookFailure('Last paragraph of description must include Change-Id.')
 
   # S-o-b tags always allowed to follow Change-ID.
-  allowed_tags = ['Signed-off-by']
+  allowed_tags = ['Signed-off-by', 'Cq-Cl-Tag']
 
   end = desc[m.end():].strip().splitlines()
   cherry_pick_marker = 'cherry picked from commit'

pre-upload_unittest.py

diff --git a/pre-upload_unittest.py b/pre-upload_unittest.py
index ac21185..13135d7 100755
--- a/pre-upload_unittest.py
+++ b/pre-upload_unittest.py
@@ -1254,6 +1254,10 @@
     """Permit s-o-b tags to follow the Change-Id."""
     self.assertMessageAccepted('foo\n\nChange-Id: I1234\nSigned-off-by: Hi\n')
 
+  def testCqClTag(self):
+    """Permit Cq-Cl-Tag tags to follow the Change-Id."""
+    self.assertMessageAccepted('foo\n\nChange-Id: I1234\nCq-Cl-Tag: Hi\n')
+
 
 class CheckCommitMessageNoOEM(CommitMessageTestCase):
   """Tests for _check_change_no_include_oem."""