Merge "[CI] Support byo for vsphere"