gitlab-ci: Backport from master

Authored by bgamari on Apr 4 2019, 10:14 AM.