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

Merge pull request #1913 from coreos-inc/incomplete-status-fix

Browse source 
Send the correct phase when setting the phase from job_complete
This commit is contained in:
josephschorr 2016-10-10 12:20:35 -04:00 • committed by GitHub
commit 16303ee0a2
2 changed files with 10 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
buildman/enums.py
View file

@ -1,3 +1,5 @@
from data.database import BUILD_PHASE
class BuildJobResult(object): class BuildJobResult(object):
""" Build job result enum """ """ Build job result enum """
INCOMPLETE = 'incomplete' INCOMPLETE = 'incomplete'
@ -11,3 +13,9 @@ class BuildServerStatus(object):
RUNNING = 'running' RUNNING = 'running'
SHUTDOWN = 'shutting_down' SHUTDOWN = 'shutting_down'
EXCEPTION = 'exception' EXCEPTION = 'exception'
RESULT_PHASES = {
BuildJobResult.INCOMPLETE: BUILD_PHASE.INTERNAL_ERROR,
BuildJobResult.COMPLETE: BUILD_PHASE.COMPLETE,
BuildJobResult.ERROR: BUILD_PHASE.ERROR,
}

4
buildman/server.py
View file

@ -12,7 +12,7 @@ from threading import Event
from trollius.coroutines import From from trollius.coroutines import From
from datetime import timedelta from datetime import timedelta
from buildman.enums import BuildJobResult, BuildServerStatus from buildman.enums import BuildJobResult, BuildServerStatus, RESULT_PHASES
from buildman.jobutil.buildstatus import StatusHandler from buildman.jobutil.buildstatus import StatusHandler
from buildman.jobutil.buildjob import BuildJob, BuildJobLoadException from buildman.jobutil.buildjob import BuildJob, BuildJobLoadException
from data import database from data import database
@ -149,7 +149,7 @@ class BuilderServer(object):
if update_phase: if update_phase:
status_handler = StatusHandler(self._build_logs, build_job.repo_build.uuid) status_handler = StatusHandler(self._build_logs, build_job.repo_build.uuid)
status_handler.set_phase(job_status) status_handler.set_phase(RESULT_PHASE[job_status])
self._job_count = self._job_count - 1 self._job_count = self._job_count - 1