LAKITU: Update the repohooks with respect to `cos-patch` tag. BUG=b/197329577 TEST=manually uploaded changes using `repo upload` RELEASE_NOTE=NONE Change-Id: I7cf152f09083c2e7dd016794c24a5d6a3c9f9390 Reviewed-on: https://cos-review.googlesource.com/c/cos/repohooks/+/21710 Reviewed-by: Robert Kolchmeyer <rkolchmeyer@google.com> Tested-by: Vaibhav Rustagi <vaibhavrustagi@google.com>
diff --git a/pre-upload.py b/pre-upload.py index f493f48..229b718 100755 --- a/pre-upload.py +++ b/pre-upload.py
@@ -121,7 +121,7 @@ TEST_FIELD_RE = r'\nTEST=\S+' RELEASE_NOTE_FIELD_RE = r'\nRELEASE_NOTE=\S+' COS_PATCH_RE = ( - r'\ncos-patch: (security-(critical|high|medium|low)|bug|lts-refresh)' + r'\ncos-patch: (security-(critical|high|moderate)|bug|lts-refresh)' ) # Exceptions @@ -796,7 +796,7 @@ 'cos-patch: security-critical\n' 'cos-patch: bug\n' 'cos-patch: lts-refresh\n' - 'For valid values, please check go/cos-lts-policy.') + 'For valid values, please check go/cos-lts-policy-dev-guide#commit-message-tagging.') return HookFailure(msg) # Check that 'cos-patch' is in the same paragraph as Change-Id.
diff --git a/pre-upload_unittest.py b/pre-upload_unittest.py index 342eecf..f532cac 100755 --- a/pre-upload_unittest.py +++ b/pre-upload_unittest.py
@@ -1637,9 +1637,7 @@ 'Change-Id: I123') self.assertMessageAccepted('\ncos-patch: security-high\n' 'Change-Id: I123') - self.assertMessageAccepted('\ncos-patch: security-medium\n' - 'Change-Id: I123') - self.assertMessageAccepted('\ncos-patch: security-low\n' + self.assertMessageAccepted('\ncos-patch: security-moderate\n' 'Change-Id: I123') self.assertMessageAccepted('\ncos-patch: bug\n' 'Change-Id: I123')