REWORK - Missed lines updated to reflected required change

Author: danielmaclaren

installation_and_upgrade/IBEX_upgrade.py

@@ -134,7 +134,7 @@ def _get_latest_existing_dir_path(release_dir, component):
             DIRECTORIES["EPICS"] = FileUtils.get_latest_directory_path(epics_build_dir, "BUILD-", "EPICS" + server_suffix)
 
             client_build_dir = os.path.join(args.kits_icp_dir, "Client_E4")
-            DIRECTORIES["Client"] = FileUtils.get_latest_directory_path(client_build_dir, "BUILD")
+            DIRECTORIES["Client"] = FileUtils.get_latest_directory_path(client_build_dir, "BUILD-")
 
             genie_python3_build_dir = os.path.join(args.kits_icp_dir, "genie_python_3")
             DIRECTORIES["genie_python_3"] = FileUtils.get_latest_directory_path(genie_python3_build_dir, "BUILD-")

installation_and_upgrade/ibex_install_utils/tasks/vhd_tasks.py

@@ -192,7 +192,7 @@ def deploy_vhds(self):
         if self._ibex_version is not None:
             build_folder = os.path.join(REMOTE_VHD_DEST_DIR, "Releases", "{}".format(self._ibex_version))
         else:
-            build_folder = os.path.join(REMOTE_VHD_DEST_DIR, "Builds", "Build{}".format(os.environ["BUILD_NUMBER"]))
+            build_folder = os.path.join(REMOTE_VHD_DEST_DIR, "Builds", "Build-{}".format(os.environ["BUILD_NUMBER"]))
         os.makedirs(build_folder)
 
         for vhd in VHDS: