Merge branch 'f/gitlab-ci' into f/phosh-private

2 jobs for foo in 3 minutes and 2 seconds (queued for 1 second)