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

Conflicts:
	test/data/test.db

initdb.py

@@ -351,6 +351,18 @@ def populate_database():
   build.uuid = 'deadbeef-dead-beef-dead-beefdeadbeef'
   build.save()
 
+  build2 = model.create_repository_build(building, token, job_config,
+                                        '68daeebd-a5b9-457f-80a0-4363b882f8ea',
+                                        'build-name', trigger)
+  build2.uuid = 'deadpork-dead-pork-dead-porkdeadpork'
+  build2.save()
+
+  build3 = model.create_repository_build(building, token, job_config,
+                                        'f49d07f9-93da-474d-ad5f-c852107c3892',
+                                        'build-name', trigger)
+  build3.uuid = 'deadduck-dead-duck-dead-duckdeadduck'
+  build3.save()
+
   org = model.create_organization('buynlarge', 'quay@devtable.com',
                                   new_user_1)
   org.stripe_id = TEST_STRIPE_ID