Fix/same base ci code for mac jobs

Merged Peio Rigaux requested to merge fix/same_base_ci_code_for_mac_jobs into master

Merge request reports