Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

simplify hotfix options #223

Merged
merged 3 commits into from
Jan 22, 2025
Merged

simplify hotfix options #223

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
eeaed73
simplify hotfix options
rerpha Jan 22, 2025
c033ebd
ruff
rerpha Jan 22, 2025
405de5f
ruff format
rerpha Jan 22, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion installation_and_upgrade/IBEX_upgrade.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
7 changes: 2 additions & 5 deletions installation_and_upgrade/ibex_install_utils/install_tasks.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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()
Expand Down Expand Up @@ -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()
Expand Down
5 changes: 2 additions & 3 deletions installation_and_upgrade/ibex_install_utils/tasks/mysql_tasks.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down Expand Up @@ -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",
Expand Down
Loading
Loading