Skip to content

Commit c5b9dd3

Browse files
Add summer updaet script
1 parent 25d0d6d commit c5b9dd3

File tree

3 files changed

+44
-1
lines changed

3 files changed

+44
-1
lines changed

installation_and_upgrade/ibex_install_utils/install_tasks.py

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -295,6 +295,12 @@ def run_force_upgrade_mysql(self):
295295
"""
296296
self._mysql_tasks.install_mysql(force=True)
297297

298+
def run_update_calibrations_repository(self):
299+
self._server_tasks.update_calibrations_repository()
300+
301+
def run_setup_log_rotation(self):
302+
self._server_tasks.setup_log_rotation()
303+
298304
def run_developer_update(self):
299305
"""Update all the developer tools to latest version"""
300306
self._mysql_tasks.install_mysql(force=False)
@@ -390,6 +396,14 @@ def run_vhd_post_install(self):
390396
UpgradeInstrument.run_force_upgrade_mysql,
391397
"upgrade mysql version to latest",
392398
),
399+
"update_calibrations_repository": (
400+
UpgradeInstrument.run_update_calibrations_repository,
401+
"update calibrations repository",
402+
),
403+
"setup_log_rotation": (
404+
UpgradeInstrument.run_setup_log_rotation,
405+
"setup log rotation",
406+
),
393407
"developer_update": (UpgradeInstrument.run_developer_update, "install latest developer tools"),
394408
"create_vhds": (
395409
UpgradeInstrument.run_vhd_creation,

installation_and_upgrade/ibex_install_utils/tasks/mysql_tasks.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@
3535

3636
MYSQL8_INSTALL_DIR = os.path.join(APPS_BASE_DIR, "MySQL")
3737
MYSQL57_INSTALL_DIR = os.path.join("C:\\", "Program Files", "MySQL", "MySQL Server 5.7")
38-
MYSQL_LATEST_VERSION = "8.0.32"
38+
MYSQL_LATEST_VERSION = "8.0.39"
3939
MYSQL_ZIP = os.path.join(
4040
INST_SHARE_AREA,
4141
"kits$",
Lines changed: 29 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,29 @@
1+
setlocal EnableDelayedExpansion
2+
3+
set "SOURCE=\\isis.cclrc.ac.uk\inst$\Kits$\CompGroup\ICP\Releases"
4+
call "%~dp0\define_latest_genie_python.bat"
5+
IF %errorlevel% neq 0 EXIT /b %errorlevel%
6+
7+
git --version
8+
9+
IF %errorlevel% neq 0 (
10+
echo No installation of Git found on machine. Please download Git from https://git-scm.com/downloads before proceeding.
11+
EXIT /b %errorlevel%
12+
)
13+
14+
xcopy /y %SOURCE%\15.0.0\EPICS\utils\logrotate.py c:\instrument\apps\epics\utils
15+
IF %errorlevel% neq 0 goto ERROR
16+
17+
for %%t in ( truncate_database force_upgrade_mysql update_calibrations_repository setup_log_rotation ) do (
18+
call "%LATEST_PYTHON%" "%~dp0IBEX_upgrade.py" --release_dir "%SOURCE%" --release_suffix "%SUFFIX%" --confirm_step %%t
19+
IF !errorlevel! neq 0 goto ERROR
20+
)
21+
22+
echo Finished
23+
pause
24+
exit /b 0
25+
26+
:ERROR
27+
echo ERROR - see messages above and install log
28+
pause
29+
exit /b 1

0 commit comments

Comments
 (0)