mirror of
https://github.com/ansible-collections/community.mysql.git
synced 2025-07-28 23:51:26 -07:00
Add support for MariaDB 11.4 (#703)
* fix missing symlink to mysql binaries for MariaDB 11+ * update tested version of MariaDB 11.4 instead of 10.5 * add changelog fragment * [CI] add way to trigger workflow manually Useful in the case we don't modifiy any files in the paths: sections of the push event. * add version check for mariadb < 10.4.6 without mariadb* binaries * Use same concatenation method between functions to avoid future confusion I didn't notice that db_dump and db_import were different, thus I introduced a bug with the initialization of the variable cmd. This commit fixes that.
This commit is contained in:
parent
e9845b0a1c
commit
dd7e297d50
7 changed files with 84 additions and 49 deletions
20
.github/workflows/ansible-test-plugins.yml
vendored
20
.github/workflows/ansible-test-plugins.yml
vendored
|
@ -13,7 +13,7 @@ on: # yamllint disable-line rule:truthy
|
|||
- '.github/workflows/ansible-test-plugins.yml'
|
||||
schedule:
|
||||
- cron: '0 6 * * *'
|
||||
|
||||
workflow_dispatch:
|
||||
|
||||
jobs:
|
||||
sanity:
|
||||
|
@ -54,8 +54,8 @@ jobs:
|
|||
db_engine_version:
|
||||
- '8.0.38'
|
||||
- '8.4.1'
|
||||
- '10.5.25'
|
||||
- '10.11.8'
|
||||
- '11.4.5'
|
||||
connector_name:
|
||||
- pymysql
|
||||
- mysqlclient
|
||||
|
@ -87,10 +87,10 @@ jobs:
|
|||
exclude:
|
||||
|
||||
- db_engine_name: mysql
|
||||
db_engine_version: '10.5.25'
|
||||
db_engine_version: '10.11.8'
|
||||
|
||||
- db_engine_name: mysql
|
||||
db_engine_version: '10.11.8'
|
||||
db_engine_version: '11.4.5'
|
||||
|
||||
- db_engine_name: mariadb
|
||||
db_engine_version: '8.0.38'
|
||||
|
@ -119,13 +119,13 @@ jobs:
|
|||
- db_engine_version: '8.0.38'
|
||||
ansible: stable-2.17
|
||||
|
||||
- db_engine_version: '10.5.25'
|
||||
- db_engine_version: '10.11.8'
|
||||
ansible: stable-2.17
|
||||
|
||||
- db_engine_version: '8.0.38'
|
||||
ansible: devel
|
||||
|
||||
- db_engine_version: '10.5.25'
|
||||
- db_engine_version: '10.11.8'
|
||||
ansible: devel
|
||||
|
||||
- db_engine_version: '8.4.1'
|
||||
|
@ -162,7 +162,7 @@ jobs:
|
|||
db_engine_version: '8.0.38'
|
||||
|
||||
- connector_version: '1.1.1'
|
||||
db_engine_version: '10.5.25'
|
||||
db_engine_version: '10.11.8'
|
||||
|
||||
services:
|
||||
db_primary:
|
||||
|
@ -175,7 +175,7 @@ jobs:
|
|||
# We write our own health-cmd because the mariadb container does not
|
||||
# provide a healthcheck
|
||||
options: >-
|
||||
--health-cmd "mysqladmin ping -P 3306 -pmsandbox |grep alive || exit 1"
|
||||
--health-cmd "${{ matrix.db_engine_name == 'mysql' && 'mysqladmin' || 'mariadb-admin' }} ping -P 3306 -pmsandbox |grep alive || exit 1"
|
||||
--health-start-period 10s
|
||||
--health-interval 10s
|
||||
--health-timeout 5s
|
||||
|
@ -189,7 +189,7 @@ jobs:
|
|||
ports:
|
||||
- 3308:3306
|
||||
options: >-
|
||||
--health-cmd "mysqladmin ping -P 3306 -pmsandbox |grep alive || exit 1"
|
||||
--health-cmd "${{ matrix.db_engine_name == 'mysql' && 'mysqladmin' || 'mariadb-admin' }} ping -P 3306 -pmsandbox |grep alive || exit 1"
|
||||
--health-start-period 10s
|
||||
--health-interval 10s
|
||||
--health-timeout 5s
|
||||
|
@ -203,7 +203,7 @@ jobs:
|
|||
ports:
|
||||
- 3309:3306
|
||||
options: >-
|
||||
--health-cmd "mysqladmin ping -P 3306 -pmsandbox |grep alive || exit 1"
|
||||
--health-cmd "${{ matrix.db_engine_name == 'mysql' && 'mysqladmin' || 'mariadb-admin' }} ping -P 3306 -pmsandbox |grep alive || exit 1"
|
||||
--health-start-period 10s
|
||||
--health-interval 10s
|
||||
--health-timeout 5s
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue