Merge remote-tracking branch 'origin/master' into rockyhorror

Conflicts:
	test/data/test.db

buildman/server.py

@@ -11,6 +11,7 @@ from threading import Event
 from trollius.coroutines import From
 from datetime import timedelta
 
+from buildman.jobutil.buildstatus import StatusHandler
 from buildman.jobutil.buildjob import BuildJob, BuildJobLoadException
 from data import database
 from data.queue import WorkQueue
@@ -158,6 +159,9 @@ class BuilderServer(object):
       logger.debug('Build job found. Checking for an avaliable worker.')
       scheduled = yield From(self._lifecycle_manager.schedule(build_job))
       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
         logger.debug('Build job scheduled. Running: %s', self._job_count)
       else:

data/migrations/versions/1d2d86d09fcd_actually_remove_the_column.py

@@ -0,0 +1,37 @@
+"""Actually remove the column access_token_id
+
+Revision ID: 1d2d86d09fcd
+Revises: 14fe12ade3df
+Create Date: 2015-02-12 16:27:30.260797
+
+"""
+
+# revision identifiers, used by Alembic.
+revision = '1d2d86d09fcd'
+down_revision = '14fe12ade3df'
+
+from alembic import op
+import sqlalchemy as sa
+from sqlalchemy.dialects import mysql
+from sqlalchemy.exc import InternalError
+
+def upgrade(tables):
+    ### commands auto generated by Alembic - please adjust! ###
+    try:
+        op.drop_constraint(u'fk_logentry_access_token_id_accesstoken', 'logentry', type_='foreignkey')
+        op.drop_index('logentry_access_token_id', table_name='logentry')
+        op.drop_column('logentry', 'access_token_id')
+    except InternalError:
+        pass
+    ### end Alembic commands ###
+
+
+def downgrade(tables):
+    ### commands auto generated by Alembic - please adjust! ###
+    try:
+        op.add_column('logentry', sa.Column('access_token_id', mysql.INTEGER(display_width=11), autoincrement=False, nullable=True))
+        op.create_foreign_key(u'fk_logentry_access_token_id_accesstoken', 'logentry', 'accesstoken', ['access_token_id'], ['id'])
+        op.create_index('logentry_access_token_id', 'logentry', ['access_token_id'], unique=False)
+    except InternalError:
+        pass
+    ### end Alembic commands ###

static/css/quay.css

@@ -845,28 +845,24 @@ i.toggle-icon:hover {
   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 {
-  background-color: #428bca;
+  background-color: rgba(66, 139, 202, 1);
 }
 
 .build-status {

static/js/app.js

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