Fixes for new jenkins build names

Author: FreddieAkeroyd

installation_and_upgrade/IBEX_upgrade.py

@@ -117,8 +117,8 @@ def _get_latest_existing_dir_path(release_dir: str, component: str) -> str:
     parser.add_argument(
         "--server_winbuild",
         dest="server_winbuild",
-        default="win7",
-        choices=["win7", "win10", "win11"],
+        default="win",
+        choices=["win"],
         help="Server winbuild.",
     )
 

installation_and_upgrade/ibex_install_utils/tasks/server_tasks.py

@@ -252,7 +252,7 @@ def upgrade_instrument_configuration(self) -> None:
         """Update the configuration on the instrument using its upgrade config script."""
         manual_prompt = (
             "Merge the master configurations branch into the instrument configuration. "
-            "From C:\Instrument\Settings\config\[machine name] run:\n"
+            "From C:\\Instrument\\Settings\\config\\[machine name] run:\n"
             "    0. Clean up any in progress merge (e.g. git merge --abort)\n"
             "    1. git checkout master\n"
             "    2. git pull\n"
@@ -340,7 +340,7 @@ def setup_calibrations_repository(self) -> None:
                 self.update_calibrations_repository()
         else:
             repo_url = "https://gitlab.stfc.ac.uk/isisexperimentcontrols/common.git"
-            location = "C:\Instrument\Settings\config\common"
+            location = r"C:\Instrument\Settings\config\common"
             RunProcess(
                 working_dir=os.curdir,
                 executable_file="git",

installation_and_upgrade/ibex_install_utils/tasks/vhd_tasks.py

@@ -259,7 +259,7 @@ def deploy_vhds(self):
     @task("Initialize var dir")
     def initialize_var_dir(self):
         """
-        Creates the folder structure for the C:\instrument\var directory.
+        Creates the folder structure for the C:\\instrument\\var directory.
         """
         # config_env creates all the necessary directories for us
         RunProcess(working_dir=EPICS_PATH, executable_file="config_env.bat").run()

installation_and_upgrade/instrument_install_latest_build_only.bat

@@ -1,12 +1,12 @@
 REM Install latest version of IBEX
 REM argument 1 is CLEAN, INCR or RELEASE for type of build touse (default: CLEAN)
 REM argument 2 is a server build prefix
-REM  normally will use EPICS_win7_x64 or EPICS_CLEAN_win7_x64 depending on incremental/clean
-REM  with prefix specified will use {prefix}_win7_x64 and {prefix}_CLEAN_win7_x64 for server install source directory
+REM  normally will use EPICS_win_x64 or EPICS_CLEAN_win_x64 depending on incremental/clean
+REM  with prefix specified will use {prefix}_win_x64 and {prefix}_CLEAN_win_x64 for server install source directory
 REM argument 3 can be x86 or x64, defaults to x64 if not specified.
-REM  this will change e.g. {prefix}_win7_x64  to {prefix}_win7_x86   as server source directory to use
-REM argument 4 can be server winbuild, defaults to win7 if not specified.
-REM  this will change e.g. {prefix}_win7_x64  to {prefix}_win1_x64   as server source directory to use
+REM  this will change e.g. {prefix}_win_x64  to {prefix}_win_x86   as server source directory to use
+REM argument 4 can be server winbuild, defaults to win if not specified.
+REM  this will change e.g. {prefix}_win_x64  to {prefix}_winABC_x64   as server source directory to use
 
 setlocal EnableDelayedExpansion