add support for triggering retests, and better robustness in the event of container failure