Revert several commits which caused problems in EE
What does this MR do?
Reverts changes to .gitlab-ci.yml from !10437 (merged) which ended up causing build failures in EE despite having no apparent conflicts.
Are there points in the code the reviewer needs to double check?
Shouldn't be much to review, this just restores some things back to the way they were before.
Why was this MR needed?
^ see above
Screenshots (if relevant)
n/a
Does this MR meet the acceptance criteria?
-
Changelog entry added, if necessary -
Documentation created/updated -
API support added - Tests
-
Added for this feature/bug -
All builds are passing
-
-
Conform by the merge request performance guides -
Conform by the style guides -
Branch has no merge conflicts with master(if it does - rebase it please) -
Squashed related commits together