integration cli: minor refactor of the build tests Upstream-commit: b36f6308176ccb44d93704388514fa0041a8584e Component: engine
integration cli: minor refactor of the build tests Upstream-commit: b36f6308176ccb44d93704388514fa0041a8584e Component: engine