When a job is retried, the variables set by the zuul_return are not overwritten. Change-Id: Ia78eac82a978740766ef5a3f5e5e32a02a8d4479