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

gitlab: consistent commit for _prepare_build

Browse source
This commit is contained in:
Jimmy Zelinskie 2015-05-03 17:58:30 -07:00
parent c8cab6b7e2
commit b3bf947af5
1 changed files with 7 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
endpoints/trigger.py
View file

@ -1264,7 +1264,7 @@ class GitLabBuildTrigger(BuildTriggerHandler):
return None return None
def _prepare_build(self, commit, ref, is_manual): def _prepare_build(self, commit_sha, ref, is_manual):
config = self.config config = self.config
gl_client = self._get_authorized_client() gl_client = self._get_authorized_client()
@ -1272,6 +1272,10 @@ class GitLabBuildTrigger(BuildTriggerHandler):
if repo is False: if repo is False:
raise TriggerStartException('Could not find repository') raise TriggerStartException('Could not find repository')
commit = gl_client.getrepositorycommit(repo['id'], commit_sha)
if repo is False:
raise TriggerStartException('Could not find repository')
try: try:
[committer] = gl_client.getusers(search=commit['committer_email']) [committer] = gl_client.getusers(search=commit['committer_email'])
except ValueError: except ValueError:
@ -1335,7 +1339,7 @@ class GitLabBuildTrigger(BuildTriggerHandler):
ref = payload['ref'] ref = payload['ref']
raise_if_skipped(self.config, ref) raise_if_skipped(self.config, ref)
return self._prepare_build(commit, ref, False) return self._prepare_build(commit['id'], ref, False)
def manual_start(self, run_parameters=None): def manual_start(self, run_parameters=None):
run_parameters = run_parameters or {} run_parameters = run_parameters or {}
@ -1360,7 +1364,7 @@ class GitLabBuildTrigger(BuildTriggerHandler):
ref = 'refs/heads/%s' % branch_name ref = 'refs/heads/%s' % branch_name
return self._prepare_build(commit, ref, True) return self._prepare_build(commit['id'], ref, True)
def get_repository_url(self): def get_repository_url(self):
gl_client = self._get_authorized_client() gl_client = self._get_authorized_client()