Add some more debug logging around bitbucket triggers and add some tests to verify we properly handle trigger branch filters
This commit is contained in:
parent
598fc6ec46
commit
eb773e40a2
2 changed files with 35 additions and 0 deletions
|
@ -488,30 +488,36 @@ class BitbucketBuildTrigger(BuildTriggerHandler):
|
|||
# Parse the JSON payload.
|
||||
payload_json = request.form.get('payload')
|
||||
if not payload_json:
|
||||
logger.debug('Skipping BitBucket request due to missing payload')
|
||||
raise SkipRequestException()
|
||||
|
||||
try:
|
||||
payload = json.loads(payload_json)
|
||||
except ValueError:
|
||||
logger.debug('Skipping BitBucket request due to invalid payload')
|
||||
raise SkipRequestException()
|
||||
|
||||
logger.debug('BitBucket trigger payload %s', payload)
|
||||
|
||||
# Make sure we have a commit in the payload.
|
||||
if not payload.get('commits'):
|
||||
logger.debug('Skipping BitBucket request due to missing commits block')
|
||||
raise SkipRequestException()
|
||||
|
||||
# Check if this build should be skipped by commit message.
|
||||
commit = payload['commits'][0]
|
||||
commit_message = commit['message']
|
||||
if should_skip_commit(commit_message):
|
||||
logger.debug('Skipping BitBucket request due to commit message request')
|
||||
raise SkipRequestException()
|
||||
|
||||
# Check to see if this build should be skipped by ref.
|
||||
if not commit.get('branch') and not commit.get('tag'):
|
||||
logger.debug('Skipping BitBucket request due to missing branch and tag')
|
||||
raise SkipRequestException()
|
||||
|
||||
ref = 'refs/heads/' + commit['branch'] if commit.get('branch') else 'refs/tags/' + commit['tag']
|
||||
logger.debug('Checking BitBucket request: %s', ref)
|
||||
raise_if_skipped(self.config, ref)
|
||||
|
||||
commit_sha = commit['node']
|
||||
|
|
Reference in a new issue