Add robot test infra affinitic refs #5817