change envlist to handle pypy errors and db errors

Change-Id: Idc5da870d1ed74bbe190852f38ea43481a85ee22