Merge lp:~powersj/jenkins-launchpad-plugin/skip-message-check into lp:jenkins-launchpad-plugin

Proposed by Joshua Powers
Status: Merged
Approved by: Joshua Powers
Approved revision: 139
Merged at revision: 139
Proposed branch: lp:~powersj/jenkins-launchpad-plugin/skip-message-check
Merge into: lp:jenkins-launchpad-plugin
Diff against target: 23 lines (+5/-1)
1 file modified
jlp/commands/voteOnMergeProposal.py (+5/-1)
To merge this branch: bzr merge lp:~powersj/jenkins-launchpad-plugin/skip-message-check
Reviewer Review Type Date Requested Status
Jenkaas Hackers Pending
Review via email: mp+341020@code.launchpad.net

Description of the change

The git-ubuntu project does not care about git-commit messages and whether or not it is in the description. For voting, they would prefer to see the actual CI results and not fake failures when nothing is in the description or git-commit bucket.

This makes that check optional.

To post a comment you must log in.
139. By Joshua Powers

Moving check onto its own line

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'jlp/commands/voteOnMergeProposal.py'
--- jlp/commands/voteOnMergeProposal.py 2015-09-24 16:09:07 +0000
+++ jlp/commands/voteOnMergeProposal.py 2018-03-08 10:03:36 +0000
@@ -17,6 +17,8 @@
17 help="Not used but kept for backwards compatibility.")17 help="Not used but kept for backwards compatibility.")
18 parser.add_argument('-p', '--merge-proposal', required=True,18 parser.add_argument('-p', '--merge-proposal', required=True,
19 help="URL of the merge proposal to update")19 help="URL of the merge proposal to update")
20 parser.add_argument('-i', '--skip-message', action='store_true',
21 help="Skip checking if a commit message is set")
20 args = vars(parser.parse_args())22 args = vars(parser.parse_args())
2123
22 # launchpadlib is not thread/process safe so we are creating launchpadlib24 # launchpadlib is not thread/process safe so we are creating launchpadlib
@@ -44,7 +46,9 @@
4446
45 #override the status to FAILED and set reason if no commit message is set47 #override the status to FAILED and set reason if no commit message is set
46 match = re.match('^(.*)/job/([^/]*)/.*$', args['build_url'])48 match = re.match('^(.*)/job/([^/]*)/.*$', args['build_url'])
47 if match:49 if args['skip_message']:
50 logger.debug('Skipping check for empty commit message')
51 elif match:
48 jenkins_url = match.group(1)52 jenkins_url = match.group(1)
49 jenkins_job = match.group(2)53 jenkins_job = match.group(2)
50 if not launchpadutils.is_commit_message_set(mp,54 if not launchpadutils.is_commit_message_set(mp,

Subscribers

People subscribed via source and target branches

to all changes: