Merge pull request #196 from ISISComputingGroup/ticket8329jenkins

Ticket8329jenkins

Author: Tom-Willemsen

build_tools/check_builds_are_recent.py

@@ -6,9 +6,6 @@
 
 kits_root = r"\\isis\inst$\kits$\CompGroup\ICP"
 
-def format_build_num_without_dash(build_num):
-    return f"BUILD{build_num}"
-
 def format_build_num_with_dash(build_num):
     return f"BUILD-{build_num}"
 
@@ -78,8 +75,6 @@ def check_build_dirs(build_dirs):
     for time, builds_by_stale_time in builds_by_stale_times.items():
         for build in builds_by_stale_time:
             directory_formatter = format_build_num_with_dash
-            if build == "Client_E4":
-                directory_formatter = format_build_num_without_dash
             build_dirs.append((build,time,directory_formatter))    
     build_dirs_not_modified_recently = check_build_dirs(build_dirs)
     if build_dirs_not_modified_recently:

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: