ci: More fixups for pre-merge pipelines running in mesa/mesa namespace

Michel Dänzer requested to merge daenzer/mesa:ci-mesa_mesa into master

/cc @ajax

Merge request reports