From d0f5808a62d95d41b86038f0e2b82b2f39cea0c6 Mon Sep 17 00:00:00 2001 From: Jimmy Zelinskie Date: Fri, 3 Apr 2015 17:14:03 -0400 Subject: [PATCH] trigger: fix custom tags --- endpoints/trigger.py | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/endpoints/trigger.py b/endpoints/trigger.py index e12c76639..01c5145aa 100644 --- a/endpoints/trigger.py +++ b/endpoints/trigger.py @@ -629,18 +629,22 @@ class CustomBuildTrigger(BuildTrigger): return config def manual_start(self, trigger, run_parameters=None): - for parameter in ['branch_name', 'commit_sha',]: + for parameter in ['commit_sha']: if parameter not in run_parameters: - raise TriggerStartException + raise TriggerStartException('missing required parameter') + config = get_trigger_config(trigger) dockerfile_id = None branch = run_parameters.get('branch_name', None) - tags = {branch} if branch is not None else {} + + tags = {branch} + if branch == 'master': + tags.add('latest') + build_name = 'HEAD' metadata = { 'commit_sha': run_parameters['commit_sha'], - 'default_branch': branch, - 'ref': 'refs/heads/%s' % branch, + 'git_url': config['build_source'], } - return dockerfile_id, tags, build_name, trigger.config['subdir'], metadata + return dockerfile_id, list(tags), build_name, config['subdir'], metadata