fix upgrade code for mariadb in CI

Author: sjpb

README.md

@@ -143,6 +143,9 @@ required to due to a a Slurm major version upgrade and carry it out if so.
 Slurm versions before 24.11 do not support this check and so no upgrade will
 occur. The following variables control behaviour during this upgrade:
 
+`openhpc_slurm_accounting_storage_client_package`: Optional. String giving the
+name of the database client package to install, e.g. `mariadb`. Default `mysql`.
+
 `openhpc_slurm_accounting_storage_backup_cmd`: Optional. String (possibly
 multi-line) giving a command for `ansible.builtin.shell` to run a backup of the
 Slurm database before performing the databse upgrade. Default is the empty

defaults/main.yml

@@ -8,7 +8,6 @@ openhpc_slurm_partitions: []
 openhpc_cluster_name:
 openhpc_packages:
   - slurm-libpmi-ohpc
-  - mysql # actually from rocky repos
 openhpc_resume_timeout: 300
 openhpc_retry_delay: 10
 openhpc_job_maxtime: '60-0' # quote this to avoid ansible converting some formats to seconds, which is interpreted as minutes by Slurm
@@ -108,3 +107,4 @@ openhpc_slurm_accounting_storage_service: ''
 openhpc_slurm_accounting_storage_backup_cmd: ''
 openhpc_slurm_accounting_storage_backup_host: "{{ openhpc_slurm_accounting_storage_host }}"
 openhpc_slurm_accounting_storage_backup_become: true
+openhpc_slurm_accounting_storage_client_package: mysql

molecule/test4/converge.yml

@@ -15,6 +15,7 @@
     openhpc_slurm_partitions:
       - name: "compute"
     openhpc_cluster_name: testohpc
+    openhpc_slurm_accounting_storage_client_package: mariadb
   tasks:
     - name: "Include ansible-role-openhpc"
       include_role:

tasks/install.yml

@@ -49,8 +49,8 @@
     install_weak_deps: false # avoids getting recommended packages
   when: openhpc_slurm_pkglist | default(false, true)
 
-- name: Install packages from openhpc_packages variable
+- name: Install other packages
   yum:
-    name: "{{ openhpc_packages }}"
+    name: "{{ openhpc_packages + [openhpc_slurm_accounting_storage_client_package] }}"
 
 ...

tasks/upgrade.yml

@@ -7,7 +7,7 @@
     login_db: "{{ openhpc_slurmdbd_mysql_database }}"
     login_user: "{{ openhpc_slurmdbd_mysql_username }}"
     login_password: "{{ openhpc_slurmdbd_mysql_password }}"
-    #login_host: 
+    login_host: "{{ openhpc_slurm_accounting_storage_host }}"
     query: SHOW TABLES
   register: _openhpc_slurmdb_tables