Refactor jobs for introduction of Centos7 support