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

Send the correct phase when setting the phase from job_complete

buildman/enums.py

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

buildman/server.py

@@ -12,7 +12,7 @@ from threading import Event
 from trollius.coroutines import From
 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.buildjob import BuildJob, BuildJobLoadException
 from data import database
@@ -149,7 +149,7 @@ class BuilderServer(object):
 
     if update_phase:
       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