Merge "Factor out duplicate code in executor repo tests" into feature/zuulv3