vbatts/quay
Archived
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Get build preparation working for bitbucket and do a lot of code cleanup around this process across all the triggers. Note: tests are not yet updated.

Browse source
This commit is contained in:
Joseph Schorr 2015-04-29 17:04:52 -04:00
parent 6479f8ddc9
commit d5c70878c5
6 changed files with 432 additions and 226 deletions
Download patch file Download diff file Expand all files Collapse all files

8
endpoints/webhooks.py
View file

@ -11,7 +11,7 @@ from util.useremails import send_invoice_email, send_subscription_change, send_p
from util.http import abort
from endpoints.trigger import (BuildTriggerHandler, ValidationRequestException,
SkipRequestException, InvalidPayloadException)
from endpoints.common import start_build
from endpoints.building import start_build
logger = logging.getLogger(__name__)
@ -87,8 +87,7 @@ def build_trigger_webhook(trigger_uuid, **kwargs):
logger.debug('Passing webhook request to handler %s', handler)
try:
specs = handler.handle_trigger_request(request)
dockerfile_id, tags, name, subdir, metadata = specs
prepared = handler.handle_trigger_request(request)
except ValidationRequestException:
# This was just a validation request, we don't need to build anything
return make_response('Okay')
@ -101,8 +100,7 @@ def build_trigger_webhook(trigger_uuid, **kwargs):
pull_robot_name = model.get_pull_robot_name(trigger)
repo = model.get_repository(namespace, repository)
start_build(repo, dockerfile_id, tags, name, subdir, False, trigger,
pull_robot_name=pull_robot_name, trigger_metadata=metadata)
start_build(repo, prepared, pull_robot_name=pull_robot_name)
return make_response('Okay')