Note: these 2 jobs should be merged into one. This was noted in a FIXME. Signed-off-by: Solomon Hykes <solomon@docker.com>