Allow specifying older version to install

Author: FreddieAkeroyd

installation_and_upgrade/IBEX_upgrade.py

@@ -69,6 +69,12 @@ def _get_latest_existing_dir_path(release_dir: str, component: str) -> str:
         default=None,
         help="directory from which the client and server should be installed",
     )
+    parser.add_argument(
+        "--release_version",
+        dest="release_version",
+        default=None,
+        help="release version of client and server to install",
+    )
     parser.add_argument(
         "--release_suffix",
         dest="release_suffix",
@@ -141,10 +147,16 @@ def _get_latest_existing_dir_path(release_dir: str, component: str) -> str:
     current_client_version = None
     server_suffix = "32" if args.server_arch == "x86" else ""
     if args.release_dir is not None:
-        current_release_dir = os.path.join(
-            args.release_dir, _get_latest_release_path(args.release_dir)
-        )
-        current_client_version = _get_latest_release_path(args.release_dir).split("\\")[-1]
+        if args.release_version is not None:
+            current_release_dir = os.path.join(
+                args.release_dir, args.release_version
+            )
+            current_client_version = args.release_version
+        else:
+            current_release_dir = os.path.join(
+                args.release_dir, _get_latest_release_path(args.release_dir)
+            )
+            current_client_version = _get_latest_release_path(args.release_dir).split("\\")[-1]
         if args.release_suffix != "":
             current_release_dir += f"-{args.release_suffix}"
 

installation_and_upgrade/instrument_deploy.bat

@@ -6,9 +6,8 @@ REM check if console has Administrative privileges
 call "%~dp0check_for_admin_console.bat"
 IF %errorlevel% neq 0 EXIT /b %errorlevel%
 
+set EXTRA_ARGS=%*
 set "SOURCE=\\isis.cclrc.ac.uk\inst$\Kits$\CompGroup\ICP\Releases"
-set SERVER_ARCH=x64
-if not "%1" == "" set SERVER_ARCH=%1
 
 if not exist "%SOURCE%" (
     @echo Cannot access network share %SOURCE%
@@ -37,7 +36,7 @@ set "START_IBEX=C:\Instrument\Apps\EPICS\start_ibex_server"
 
 IF EXIST "C:\Instrument\Apps\EPICS" (
 
-  call python "%~dp0IBEX_upgrade.py" --release_dir "%SOURCE%" --release_suffix "%SUFFIX%" --server_arch %SERVER_ARCH% --confirm_step instrument_deploy_pre_stop
+  call python "%~dp0IBEX_upgrade.py" --release_dir "%SOURCE%" --release_suffix "%SUFFIX%" --confirm_step instrument_deploy_pre_stop %EXTRA_ARGS%
   IF !errorlevel! neq 0 exit /b !errorlevel!
   start /wait cmd /c "%STOP_IBEX%"
 )
@@ -78,12 +77,12 @@ if "%DETECT_OLD_GALIL%" == "YES" (
     )
 )
 
-call python "%~dp0IBEX_upgrade.py" --release_dir "%SOURCE%" --release_suffix "%SUFFIX%" --server_arch %SERVER_ARCH% --confirm_step instrument_deploy_main
+call python "%~dp0IBEX_upgrade.py" --release_dir "%SOURCE%" --release_suffix "%SUFFIX%" --confirm_step instrument_deploy_main %EXTRA_ARGS%
 IF %errorlevel% neq 0 exit /b %errorlevel%
 
 start /i /wait cmd /c "%START_IBEX%"
 
-call python "%~dp0IBEX_upgrade.py" --release_dir "%SOURCE%" --release_suffix "%SUFFIX%" --server_arch %SERVER_ARCH% --confirm_step instrument_deploy_post_start
+call python "%~dp0IBEX_upgrade.py" --release_dir "%SOURCE%" --release_suffix "%SUFFIX%" --confirm_step instrument_deploy_post_start %EXTRA_ARGS%
 call rmdir /s /q %UV_TEMP_VENV%
 
 exit /b 0

installation_and_upgrade/instrument_deploy_32bit.bat

@@ -1,3 +1,3 @@
 setlocal
-call %~dp0instrument_deploy.bat x86
+call %~dp0instrument_deploy.bat --server_arch x86 %*
 IF %errorlevel% neq 0 EXIT /b %errorlevel%