Merge #712(kitsune): More CI fixes #1472

Job	Run time
CI (ubuntu-22.04, 6.4, e2ee)	7m 25s
CI (ubuntu-22.04, 6.4, e2ee)	7m 25s
CI (ubuntu-22.04, 6.4)	4m 19s
CI (ubuntu-22.04, 6.4)	4m 19s
CI (ubuntu-22.04, 6.4, GCC, e2ee)	12m 33s
CI (ubuntu-22.04, 6.4, GCC, e2ee)	19m 32s
CI (ubuntu-22.04, 6.4, GCC)	5m 36s
CI (ubuntu-22.04, 6.4, GCC)	5m 36s
CI (ubuntu-22.04, 5.15, e2ee)	5m 56s
CI (ubuntu-22.04, 5.15, e2ee)	5m 56s
CI (macos-11, 6.4, e2ee)	7m 39s
CI (macos-11, 6.4, e2ee)	7m 39s
CI (macos-11, 6.4)	4m 53s
CI (macos-11, 6.4)	4m 53s
CI (macos-11, 5.15, e2ee)	7m 49s
CI (macos-11, 5.15, e2ee)	7m 49s
CI (windows-2019, 6.4, e2ee)	7m 31s
CI (windows-2019, 6.4, e2ee)	7m 31s
CI (windows-2019, 6.4)	4m 43s
CI (windows-2019, 6.4)	4m 43s
CI (windows-2019, 5.15, e2ee)	7m 31s
CI (windows-2019, 5.15, e2ee)	6m 13s
CI (ubuntu-22.04, 5.15, e2ee, update-api, codeql)	16m 6s
CI (ubuntu-22.04, 5.15, e2ee, update-api, codeql)	16m 6s
CI (ubuntu-22.04, 5.15, GCC, update-api)	7m 13s
CI (ubuntu-22.04, 5.15, GCC, update-api)	7m 13s
	3h 24m 9s

Provide feedback