Merge "Revert "Use new infra pipelines"" into feature/zuulv3