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

Conflicts:
	test/data/test.db

data/database.py

@@ -339,6 +339,10 @@ class PermissionPrototype(BaseModel):
     )
 
 
+class AccessTokenKind(BaseModel):
+  name = CharField(unique=True, index=True)
+
+
 class AccessToken(BaseModel):
   friendly_name = CharField(null=True)
   code = CharField(default=random_string_generator(length=64), unique=True,
@@ -347,6 +351,7 @@ class AccessToken(BaseModel):
   created = DateTimeField(default=datetime.now)
   role = ForeignKeyField(Role)
   temporary = BooleanField(default=True)
+  kind = ForeignKeyField(AccessTokenKind, null=True)
 
 
 class BuildTriggerService(BaseModel):
@@ -481,6 +486,7 @@ class BUILD_PHASE(object):
   PULLING = 'pulling'
   BUILDING = 'building'
   PUSHING = 'pushing'
+  WAITING = 'waiting'
   COMPLETE = 'complete'
 
 
@@ -499,7 +505,7 @@ class RepositoryBuild(BaseModel):
   access_token = ForeignKeyField(AccessToken)
   resource_key = CharField(index=True)
   job_config = TextField()
-  phase = CharField(default='waiting')
+  phase = CharField(default=BUILD_PHASE.WAITING)
   started = DateTimeField(default=datetime.now)
   display_name = CharField()
   trigger = ForeignKeyField(RepositoryBuildTrigger, null=True, index=True)
@@ -607,4 +613,5 @@ all_models = [User, Repository, Image, AccessToken, Role, RepositoryPermission,
               Notification, ImageStorageLocation, ImageStoragePlacement,
               ExternalNotificationEvent, ExternalNotificationMethod, RepositoryNotification,
               RepositoryAuthorizedEmail, ImageStorageTransformation, DerivedImageStorage,
-              TeamMemberInvite, ImageStorageSignature, ImageStorageSignatureKind]
+              TeamMemberInvite, ImageStorageSignature, ImageStorageSignatureKind,
+              AccessTokenKind]