Skip to content

Commit eeaed73

Browse files
committed
simplify hotfix options
1 parent 6040db9 commit eeaed73

File tree

5 files changed

+9
-35
lines changed

5 files changed

+9
-35
lines changed

installation_and_upgrade/IBEX_upgrade.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@ def _get_latest_existing_dir_path(release_dir: str, component: str) -> str:
7373
"--release_suffix",
7474
dest="release_suffix",
7575
default="",
76-
help="Suffix for specifying non-standard releases " "(such as those including hot fixes)",
76+
help="Suffix for specifying non-standard releases (such as those including hot fixes)",
7777
)
7878
parser.add_argument(
7979
"--server_build_prefix", default="EPICS", help="Prefix for build directory name"

installation_and_upgrade/ibex_install_utils/install_tasks.py

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -188,8 +188,7 @@ def run_instrument_install(self) -> None:
188188
self._system_tasks.configure_com_ports()
189189
self._server_tasks.setup_calibrations_repository()
190190
self._server_tasks.update_calibrations_repository()
191-
self._system_tasks.apply_changes_noted_in_release_notes()
192-
self._system_tasks.update_release_notes()
191+
self._system_tasks.clear_or_reapply_hotfixes()
193192
self._system_tasks.restart_vis()
194193
self._server_tasks.install_wiring_tables()
195194
self._server_tasks.configure_motion()
@@ -254,9 +253,7 @@ def run_instrument_deploy_main(self) -> None:
254253
self._git_tasks.checkout_to_release_branch()
255254
self._server_tasks.upgrade_instrument_configuration()
256255
self._server_tasks.update_calibrations_repository()
257-
self._system_tasks.apply_changes_noted_in_release_notes()
258-
self._system_tasks.update_release_notes()
259-
self._system_tasks.reapply_hotfixes()
256+
self._system_tasks.clear_or_reapply_hotfixes()
260257
self._python_tasks.update_script_definitions()
261258
self._python_tasks.remove_instrument_script_githooks()
262259
self._server_tasks.setup_log_rotation()

installation_and_upgrade/ibex_install_utils/tasks/mysql_tasks.py

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -106,8 +106,7 @@ def truncate_database(self) -> None:
106106

107107
except ErrorInRun as ex:
108108
self.prompt.prompt_and_raise_if_not_yes(
109-
f"Unable to run mysql command, please truncate the database manually. "
110-
f"Error is {ex}"
109+
f"Unable to run mysql command, please truncate the database manually. Error is {ex}"
111110
)
112111

113112
def _configure_mysql(self) -> None:
@@ -182,7 +181,7 @@ def _initialize_mysql_data_area_for_vhd(self) -> None:
182181
executable_file="mysqld.exe",
183182
executable_directory=os.path.join(MYSQL8_INSTALL_DIR, "bin"),
184183
prog_args=[
185-
f'--datadir={os.path.join(MYSQL_FILES_DIR, "data")}',
184+
f"--datadir={os.path.join(MYSQL_FILES_DIR, 'data')}",
186185
"--initialize-insecure",
187186
"--console",
188187
"--log-error-verbosity=3",

installation_and_upgrade/ibex_install_utils/tasks/server_tasks.py

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -359,8 +359,7 @@ def update_calibrations_repository(self):
359359
def perform_server_tests(self):
360360
"""Test that the server works"""
361361
server_release_tests_url = (
362-
"https://github.com/ISISComputingGroup/ibex_developers_manual/wiki/"
363-
"Server-Release-Tests"
362+
"https://github.com/ISISComputingGroup/ibex_developers_manual/wiki/Server-Release-Tests"
364363
)
365364

366365
print(f"For further details, see {server_release_tests_url}")

installation_and_upgrade/ibex_install_utils/tasks/system_tasks.py

Lines changed: 3 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -175,17 +175,6 @@ def configure_com_ports(self) -> None:
175175
"- etc.\n"
176176
)
177177

178-
@task("Reapply Hotfixes")
179-
def reapply_hotfixes(self) -> None:
180-
"""
181-
Reapply any hotfixes to the build.
182-
"""
183-
self.prompt.prompt_and_raise_if_not_yes(
184-
"Have you applied any hotfixes listed that are not fixed by the release,"
185-
" as on the instrument "
186-
"release notes at https://github.com/ISISComputingGroup/IBEX/wiki?"
187-
)
188-
189178
@task("Restart VIs")
190179
def restart_vis(self) -> None:
191180
"""
@@ -195,15 +184,6 @@ def restart_vis(self) -> None:
195184
"Please restart any VIs that were running at the start of the upgrade"
196185
)
197186

198-
@task("Update release notes")
199-
def update_release_notes(self) -> None:
200-
"""
201-
Update the release notes.
202-
"""
203-
self.prompt.prompt_and_raise_if_not_yes(
204-
"Have you updated the instrument release notes at https://github.com/ISISComputingGroup/IBEX/wiki?"
205-
)
206-
207187
@task("Update Instrument List")
208188
def update_instlist(self) -> None:
209189
"""
@@ -251,15 +231,14 @@ def inform_instrument_scientists(self) -> None:
251231

252232
self.prompt.prompt_and_raise_if_not_yes(email_template)
253233

254-
@task("Apply changes in release notes")
255-
def apply_changes_noted_in_release_notes(self) -> None:
234+
@task("Clear/reapply hotfixes")
235+
def clear_or_reapply_hotfixes(self) -> None:
256236
"""
257237
Apply any changes noted in the release notes.
258238
"""
259239
# For future reference, genie_python can send emails!
260240
self.prompt.prompt_and_raise_if_not_yes(
261-
"Look in the IBEX wiki at the release notes for the version you are deploying."
262-
" Apply needed fixes."
241+
"Have you cleared/reapplied hotfixes listed in https://github.com/ISISComputingGroup/IBEX/wiki#instrument-information--hotfixes?"
263242
)
264243

265244
def check_resources(self) -> None:

0 commit comments

Comments
 (0)