gitlab-ci: A bit of reorganization

Authored by bgamari on Fri, Mar 1, 9:54 AM.