Refactor jobs

Change-Id: Id333b722cd6e041dc0be344115d168d5c22f5457
3 files changed