simplify hotfix options

Author: rerpha

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"

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()

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",

installation_and_upgrade/ibex_install_utils/tasks/server_tasks.py

@@ -359,8 +359,7 @@ def update_calibrations_repository(self):
     def perform_server_tests(self):
         """Test that the server works"""
         server_release_tests_url = (
-            "https://github.com/ISISComputingGroup/ibex_developers_manual/wiki/"
-            "Server-Release-Tests"
+            "https://github.com/ISISComputingGroup/ibex_developers_manual/wiki/Server-Release-Tests"
         )
 
         print(f"For further details, see {server_release_tests_url}")

installation_and_upgrade/ibex_install_utils/tasks/system_tasks.py

@@ -175,17 +175,6 @@ def configure_com_ports(self) -> None:
             "- etc.\n"
         )
 
-    @task("Reapply Hotfixes")
-    def reapply_hotfixes(self) -> None:
-        """
-        Reapply any hotfixes to the build.
-        """
-        self.prompt.prompt_and_raise_if_not_yes(
-            "Have you applied any hotfixes listed that are not fixed by the release,"
-            " as on the instrument "
-            "release notes at https://github.com/ISISComputingGroup/IBEX/wiki?"
-        )
-
     @task("Restart VIs")
     def restart_vis(self) -> None:
         """
@@ -195,15 +184,6 @@ def restart_vis(self) -> None:
             "Please restart any VIs that were running at the start of the upgrade"
         )
 
-    @task("Update release notes")
-    def update_release_notes(self) -> None:
-        """
-        Update the release notes.
-        """
-        self.prompt.prompt_and_raise_if_not_yes(
-            "Have you updated the instrument release notes at https://github.com/ISISComputingGroup/IBEX/wiki?"
-        )
-
     @task("Update Instrument List")
     def update_instlist(self) -> None:
         """
@@ -251,15 +231,14 @@ def inform_instrument_scientists(self) -> None:
 
         self.prompt.prompt_and_raise_if_not_yes(email_template)
 
-    @task("Apply changes in release notes")
-    def apply_changes_noted_in_release_notes(self) -> None:
+    @task("Clear/reapply hotfixes")
+    def clear_or_reapply_hotfixes(self) -> None:
         """
         Apply any changes noted in the release notes.
         """
         # For future reference, genie_python can send emails!
         self.prompt.prompt_and_raise_if_not_yes(
-            "Look in the IBEX wiki at the release notes for the version you are deploying."
-            " Apply needed fixes."
+            "Have you cleared/reapplied hotfixes listed in https://github.com/ISISComputingGroup/IBEX/wiki#instrument-information--hotfixes?"
         )
 
     def check_resources(self) -> None: