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

Merge branch 'master' of github.com:coreos-inc/quay

Browse source
This commit is contained in:
Jake Moshenko 2015-02-13 11:57:09 -05:00
commit f5a16098fd
4 changed files with 16 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

4
buildman/server.py
View file

@ -11,6 +11,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.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
from data.queue import WorkQueue from data.queue import WorkQueue
@ -158,6 +159,9 @@ class BuilderServer(object):
logger.debug('Build job found. Checking for an avaliable worker.') logger.debug('Build job found. Checking for an avaliable worker.')
scheduled = yield From(self._lifecycle_manager.schedule(build_job)) scheduled = yield From(self._lifecycle_manager.schedule(build_job))
if scheduled: if scheduled:
status_handler = StatusHandler(self._build_logs, build_job.repo_build.uuid)
status_handler.set_phase('build-scheduled')
self._job_count = self._job_count + 1 self._job_count = self._job_count + 1
logger.debug('Build job scheduled. Running: %s', self._job_count) logger.debug('Build job scheduled. Running: %s', self._job_count)
else: else:

22
static/css/quay.css
View file

@ -845,28 +845,24 @@ i.toggle-icon:hover {
background-color: #DFFF00; background-color: #DFFF00;
} }
.phase-icon.waiting, .phase-icon.unpacking, .phase-icon.starting, .phase-icon.initializing { .phase-icon.waiting, .phase-icon.build-scheduled {
background-color: #ddd; background-color: rgba(66, 139, 202, 0.2);
} }
.phase-icon.pulling { .phase-icon.unpacking, .phase-icon.starting, .phase-icon.initializing {
background-color: #cab442; background-color: rgba(66, 139, 202, 0.4);
} }
.phase-icon.building { .phase-icon.pulling, .phase-icon.priming-cache, .phase-icon.checking-cache {
background-color: #f0ad4e; background-color: rgba(66, 139, 202, 0.6);
} }
.phase-icon.priming-cache, .phase-icon.checking-cache { .phase-icon.pushing, .phase-icon.building {
background-color: #cab442; background-color: rgba(66, 139, 202, 0.8);
}
.phase-icon.pushing {
background-color: #5cb85c;
} }
.phase-icon.complete { .phase-icon.complete {
background-color: #428bca; background-color: rgba(66, 139, 202, 1);
} }
.build-status { .build-status {

3
static/js/app.js
View file

@ -5830,6 +5830,9 @@ quayApp.directive('buildMessage', function () {
case 'priming-cache': case 'priming-cache':
return 'Priming cache for build'; return 'Priming cache for build';
case 'build-scheduled':
return 'Preparing build node';
case 'pushing': case 'pushing':
return 'Pushing image built from Dockerfile'; return 'Pushing image built from Dockerfile';

BIN
test/data/test.db
View file

Binary file not shown.