Merge pull request #223 from ISISComputingGroup/simplify_hotfix_options

simplify hotfix options
ISISComputingGroup · Jan 22, 2025 · 03f847c · 03f847c
2 parents 6040db9 + 405de5f
commit 03f847c
Show file tree

Hide file tree

Showing 5 changed files with 65 additions and 82 deletions.
diff --git a/installation_and_upgrade/IBEX_upgrade.py b/installation_and_upgrade/IBEX_upgrade.py
@@ -73,7 +73,7 @@ def _get_latest_existing_dir_path(release_dir: str, component: str) -> str:
         "--release_suffix",
         dest="release_suffix",
         default="",
-        help="Suffix for specifying non-standard releases " "(such as those including hot fixes)",
+        help="Suffix for specifying non-standard releases (such as those including hot fixes)",
     )
     parser.add_argument(
         "--server_build_prefix", default="EPICS", help="Prefix for build directory name"

diff --git a/installation_and_upgrade/ibex_install_utils/install_tasks.py b/installation_and_upgrade/ibex_install_utils/install_tasks.py
@@ -188,8 +188,7 @@ def run_instrument_install(self) -> None:
         self._system_tasks.configure_com_ports()
         self._server_tasks.setup_calibrations_repository()
         self._server_tasks.update_calibrations_repository()
-        self._system_tasks.apply_changes_noted_in_release_notes()
-        self._system_tasks.update_release_notes()
+        self._system_tasks.clear_or_reapply_hotfixes()
         self._system_tasks.restart_vis()
         self._server_tasks.install_wiring_tables()
         self._server_tasks.configure_motion()
@@ -254,9 +253,7 @@ def run_instrument_deploy_main(self) -> None:
         self._git_tasks.checkout_to_release_branch()
         self._server_tasks.upgrade_instrument_configuration()
         self._server_tasks.update_calibrations_repository()
-        self._system_tasks.apply_changes_noted_in_release_notes()
-        self._system_tasks.update_release_notes()
-        self._system_tasks.reapply_hotfixes()
+        self._system_tasks.clear_or_reapply_hotfixes()
         self._python_tasks.update_script_definitions()
         self._python_tasks.remove_instrument_script_githooks()
         self._server_tasks.setup_log_rotation()

diff --git a/installation_and_upgrade/ibex_install_utils/tasks/mysql_tasks.py b/installation_and_upgrade/ibex_install_utils/tasks/mysql_tasks.py
@@ -106,8 +106,7 @@ def truncate_database(self) -> None:
 
         except ErrorInRun as ex:
             self.prompt.prompt_and_raise_if_not_yes(
-                f"Unable to run mysql command, please truncate the database manually. "
-                f"Error is {ex}"
+                f"Unable to run mysql command, please truncate the database manually. Error is {ex}"
             )
 
     def _configure_mysql(self) -> None:
@@ -182,7 +181,7 @@ def _initialize_mysql_data_area_for_vhd(self) -> None:
             executable_file="mysqld.exe",
             executable_directory=os.path.join(MYSQL8_INSTALL_DIR, "bin"),
             prog_args=[
-                f'--datadir={os.path.join(MYSQL_FILES_DIR, "data")}',
+                f"--datadir={os.path.join(MYSQL_FILES_DIR, 'data')}",
                 "--initialize-insecure",
                 "--console",
                 "--log-error-verbosity=3",