CI fixes needed for test-primops testing

Closed Matthew Pickering requested to merge wip/test-primops-prep into master

I have separated out !10910 (closed) because test-primops is still not passing CI cleanly. Therefore these patches can be tested and reviewed in isolated (as getting these merged is also blocking other issues).

Merge request reports