validator_discovery: small tweak in retrying logic (#3102)

* validator_discovery: small tweak in retrying logic

* validator_discovery: use timeouts instead
7 jobs for master in 16 minutes and 42 seconds (queued for 2 seconds)