combining CI and servicelab configs
Summary: instead of having 1 list of configs for OSS ci and another set for servicelab we combine both here into one common dictionary
Reviewed By: danzimm
Differential Revision: D64183688
fbshipit-source-id: fa47780a3bf3ba8669c6e8fd406cff5542fd06e6
