Refactor to use GHA test matrix

This commit is contained in:
Laurent Indermuehle 2023-03-23 15:20:28 +01:00
parent 17a87c9fdf
commit 96efd41acc
No known key found for this signature in database
GPG key ID: 93FA944C9F34DD09
2 changed files with 168 additions and 284 deletions

View file

@ -40,7 +40,30 @@ jobs:
strategy: strategy:
fail-fast: false fail-fast: false
matrix: matrix:
include: ansible:
- stable-2.12
- stable-2.13
- stable-2.14
- devel
db_engine_name:
- mysql
- mariadb
db_engine_version:
- 5.7.40
- 8.0.31
- 10.4.27
- 10.5.18
- 10.6.11
python:
- '3.8'
- '3.9'
- '3.10'
connector_name:
- pymysql
- mysqlclient
connector_version:
- 0.7.11
- 0.9.3
# Before we can activate test with pymysql 1.0.2 we should debug the # Before we can activate test with pymysql 1.0.2 we should debug the
# following plugins: # following plugins:
# #
@ -49,279 +72,121 @@ jobs:
# #
# mysql_replication: # mysql_replication:
# test "Assert that startreplica is not changed" failed # test "Assert that startreplica is not changed" failed
# - 1.0.2
- 2.0.1
- 2.0.3
- 2.1.1
exclude:
- db_engine_name: mysql
db_engine_version: 10.4.27
# ================================================================== - db_engine_name: mysql
# mysql-client 5.7 + Python 3.8 db_engine_version: 10.5.18
# ==================================================================
- ansible: stable-2.12 - db_engine_name: mysql
db_engine_name: mysql db_engine_version: 10.6.11
- db_engine_name: mariadb
db_engine_version: 5.7.40 db_engine_version: 5.7.40
python: '3.8'
connector_name: pymysql - db_engine_name: mariadb
db_engine_version: 8.0.31
- connector_name: pymysql
connector_version: 2.0.1
- connector_name: pymysql
connector_version: 2.0.3
- connector_name: pymysql
connector_version: 2.1.1
- connector_name: mysqlclient
connector_version: 0.7.11 connector_version: 0.7.11
- ansible: stable-2.12
db_engine_name: mysql - connector_name: mysqlclient
db_engine_version: 5.7.40
python: '3.8'
connector_name: pymysql
connector_version: 0.9.3 connector_version: 0.9.3
- ansible: stable-2.12
db_engine_name: mysql - connector_name: mysqlclient
db_engine_version: 5.7.40 connector_version: 1.0.2
- db_engine_version: 5.7.40
python: '3.9'
- db_engine_version: 5.7.40
python: '3.10'
- db_engine_version: 5.7.40
ansible: stable-2.13
- db_engine_version: 5.7.40
ansible: stable-2.14
- db_engine_version: 5.7.40
ansible: devel
- db_engine_version: 8.0.31
python: '3.8' python: '3.8'
connector_name: mysqlclient
- db_engine_version: 8.0.31
python: '3.8'
- db_engine_version: 10.4.27
python: '3.10'
- db_engine_version: 10.4.27
ansible: devel
- db_engine_version: 10.6.11
python: '3.8'
- db_engine_version: 10.6.11
python: '3.9'
- python: '3.8'
connector_version: 2.0.3
- python: '3.8'
connector_version: 2.1.1
- python: '3.9'
connector_version: 0.7.11
- python: '3.9'
connector_version: 2.0.1 connector_version: 2.0.1
- python: '3.9'
connector_version: 2.1.1
# ================================================================== - python: '3.10'
# mysql-client 8 + Python 3.8 connector_version: 0.7.11
# ==================================================================
- ansible: stable-2.12 - python: '3.10'
db_engine_name: mysql
db_engine_version: 8.0.31
python: '3.8'
connector_name: pymysql
connector_version: 0.9.3 connector_version: 0.9.3
- ansible: stable-2.12
db_engine_name: mysql - python: '3.10'
db_engine_version: 8.0.31
python: '3.8'
connector_name: mysqlclient
connector_version: 2.0.1 connector_version: 2.0.1
- python: '3.10'
# ==================================================================
# mysql-client 8 + Python 3.9
# ==================================================================
- ansible: stable-2.13
db_engine_name: mysql
db_engine_version: 8.0.31
python: '3.9'
connector_name: pymysql
connector_version: 0.9.3
- ansible: stable-2.13
db_engine_name: mysql
db_engine_version: 8.0.31
python: '3.9'
connector_name: mysqlclient
connector_version: 2.0.3
- ansible: stable-2.14
db_engine_name: mysql
db_engine_version: 8.0.31
python: '3.9'
connector_name: pymysql
connector_version: 0.9.3
- ansible: stable-2.14
db_engine_name: mysql
db_engine_version: 8.0.31
python: '3.9'
connector_name: mysqlclient
connector_version: 2.0.3
# ==================================================================
# mysql-client 8 + Python 3.10
# ==================================================================
# - ansible: stable-2.13
# db_engine_name: mysql
# db_engine_version: 8.0.31
# python: '3.10'
# connector_name: pymysql
# connector_version: 1.0.2
- ansible: stable-2.13
db_engine_name: mysql
db_engine_version: 8.0.31
python: '3.10'
connector_name: mysqlclient
connector_version: 2.1.1 connector_version: 2.1.1
# - ansible: stable-2.14 - python: '3.8'
# db_engine_name: mysql ansible: stable-2.13
# db_engine_version: 8.0.31
# python: '3.10'
# connector_name: pymysql
# connector_version: 1.0.2
- ansible: stable-2.14
db_engine_name: mysql
db_engine_version: 8.0.31
python: '3.10'
connector_name: mysqlclient
connector_version: 2.1.1
# - ansible: devel - python: '3.8'
# db_engine_name: mysql ansible: stable-2.14
# db_engine_version: 8.0.31
# python: '3.10'
# connector_name: pymysql
# connector_version: 1.0.2
- ansible: devel
db_engine_name: mysql
db_engine_version: 8.0.31
python: '3.10'
connector_name: mysqlclient
connector_version: 2.1.1
# ================================================================== - python: '3.8'
# mariadb-client 10.3 + Python 3.8 ansible: devel
# ==================================================================
- ansible: stable-2.12
db_engine_name: mariadb
db_engine_version: 10.4.27
python: '3.8'
connector_name: pymysql
connector_version: 0.9.3
- ansible: stable-2.12
db_engine_name: mariadb
db_engine_version: 10.4.27
python: '3.8'
connector_name: mysqlclient
connector_version: 2.0.1
- ansible: stable-2.12
db_engine_name: mariadb
db_engine_version: 10.5.18
python: '3.8'
connector_name: pymysql
connector_version: 0.9.3
- ansible: stable-2.12
db_engine_name: mariadb
db_engine_version: 10.5.18
python: '3.8'
connector_name: mysqlclient
connector_version: 2.0.1
- python: '3.9'
ansible: stable-2.12
# ================================================================== - python: '3.9'
# mariadb-client 10.3 + Python 3.9 ansible: devel
# ==================================================================
- ansible: stable-2.13
db_engine_name: mariadb
db_engine_version: 10.4.27
python: '3.9'
connector_name: pymysql
connector_version: 0.9.3
- ansible: stable-2.13
db_engine_name: mariadb
db_engine_version: 10.4.27
python: '3.9'
connector_name: mysqlclient
connector_version: 2.0.3
- ansible: stable-2.13
db_engine_name: mariadb
db_engine_version: 10.5.18
python: '3.9'
connector_name: pymysql
connector_version: 0.9.3
- ansible: stable-2.13
db_engine_name: mariadb
db_engine_version: 10.5.18
python: '3.9'
connector_name: mysqlclient
connector_version: 2.0.3
- ansible: stable-2.14 - python: '3.10'
db_engine_name: mariadb ansible: stable-2.12
db_engine_version: 10.4.27
python: '3.9'
connector_name: pymysql
connector_version: 0.9.3
- ansible: stable-2.14
db_engine_name: mariadb
db_engine_version: 10.4.27
python: '3.9'
connector_name: mysqlclient
connector_version: 2.0.3
- ansible: stable-2.14
db_engine_name: mariadb
db_engine_version: 10.5.18
python: '3.9'
connector_name: pymysql
connector_version: 0.9.3
- ansible: stable-2.14
db_engine_name: mariadb
db_engine_version: 10.5.18
python: '3.9'
connector_name: mysqlclient
connector_version: 2.0.3
# ==================================================================
# mariadb-client 10.6 + Python 3.10
# ==================================================================
# - ansible: stable-2.13
# db_engine_name: mariadb
# db_engine_version: 10.5.18
# python: '3.10'
# connector_name: pymysql
# connector_version: 1.0.2
- ansible: stable-2.13
db_engine_name: mariadb
db_engine_version: 10.5.18
python: '3.10'
connector_name: mysqlclient
connector_version: 2.1.1
# - ansible: stable-2.13
# db_engine_name: mariadb
# db_engine_version: 10.6.11
# python: '3.10'
# connector_name: pymysql
# connector_version: 1.0.2
- ansible: stable-2.13
db_engine_name: mariadb
db_engine_version: 10.6.11
python: '3.10'
connector_name: mysqlclient
connector_version: 2.1.1
# - ansible: stable-2.14
# db_engine_name: mariadb
# db_engine_version: 10.5.18
# python: '3.10'
# connector_name: pymysql
# connector_version: 1.0.2
- ansible: stable-2.14
db_engine_name: mariadb
db_engine_version: 10.5.18
python: '3.10'
connector_name: mysqlclient
connector_version: 2.1.1
# - ansible: stable-2.14
# db_engine_name: mariadb
# db_engine_version: 10.6.11
# python: '3.10'
# connector_name: pymysql
# connector_version: 1.0.2
- ansible: stable-2.14
db_engine_name: mariadb
db_engine_version: 10.6.11
python: '3.10'
connector_name: mysqlclient
connector_version: 2.1.1
# - ansible: devel
# db_engine_name: mariadb
# db_engine_version: 10.5.18
# python: '3.10'
# connector_name: pymysql
# connector_version: 1.0.2
- ansible: devel
db_engine_name: mariadb
db_engine_version: 10.5.18
python: '3.10'
connector_name: mysqlclient
connector_version: 2.1.1
# - ansible: devel
# db_engine_name: mariadb
# db_engine_version: 10.6.11
# python: '3.10'
# connector_name: pymysql
# connector_version: 1.0.2
- ansible: devel
db_engine_name: mariadb
db_engine_version: 10.6.11
python: '3.10'
connector_name: mysqlclient
connector_version: 2.1.1
services: services:
db_primary: db_primary:

View file

@ -28,47 +28,66 @@ def extract_matrix(workflow_yaml):
return matrix return matrix
# def is_exclude(exclude_list, test_suite): def is_exclude(exclude_list, test_suite):
# test_is_excluded = False test_is_excluded = False
# for excl in exclude_list: for excl in exclude_list:
# match = 0 match = 0
# if 'ansible' in excl: if 'ansible' in excl:
# if excl.get('ansible') == test_suite[0]: if excl.get('ansible') == test_suite.get('ansible'):
# match += 1 match += 1
# if 'db_engine_version' in excl: if 'db_engine_name' in excl:
# if excl.get('db_engine_version') == test_suite[1]: if excl.get('db_engine_name') == test_suite.get('db_engine_name'):
# match += 1 match += 1
# if 'python' in excl: if 'db_engine_version' in excl:
# if excl.get('python') == test_suite[2]: if excl.get('db_engine_version') == test_suite.get('db_engine_version'):
# match += 1 match += 1
# if 'connector' in excl: if 'python' in excl:
# if excl.get('connector') == test_suite[3]: if excl.get('python') == test_suite.get('python'):
# match += 1 match += 1
# if match > 1: if 'connector_name' in excl:
# test_is_excluded = True if excl.get('connector_name') == test_suite.get('connector_name'):
match += 1
# return test_is_excluded if 'connector_version' in excl:
if excl.get('connector_version') == test_suite.get('connector_version'):
match += 1
if match > 1:
test_is_excluded = True
return test_is_excluded
return test_is_excluded
def main(): def main():
workflow_yaml = read_github_workflow_file() workflow_yaml = read_github_workflow_file()
tests_matrix_yaml = extract_matrix(workflow_yaml) tests_matrix_yaml = extract_matrix(workflow_yaml)
# matrix = [] matrix = []
# exclude_list = tests_matrix_yaml.get('exclude') exclude_list = tests_matrix_yaml.get('exclude')
# for ansible in tests_matrix_yaml.get('ansible'): for ansible in tests_matrix_yaml.get('ansible'):
# for db_engine in tests_matrix_yaml.get('db_engine_version'): for db_engine_name in tests_matrix_yaml.get('db_engine_name'):
# for python in tests_matrix_yaml.get('python'): for db_engine_version in tests_matrix_yaml.get('db_engine_version'):
# for connector in tests_matrix_yaml.get('connector'): for python in tests_matrix_yaml.get('python'):
# if not is_exclude(exclude_list, (ansible, db_engine, python, connector)): for connector_name in tests_matrix_yaml.get('connector_name'):
# matrix.append((ansible, db_engine, python, connector)) for connector_version in tests_matrix_yaml.get('connector_version'):
test_suite = {
'ansible': ansible,
'db_engine_name': db_engine_name,
'db_engine_version': db_engine_version,
'python': python,
'connector_name': connector_name,
'connector_version': connector_version
}
if not is_exclude(exclude_list, test_suite):
matrix.append(test_suite)
for tests in tests_matrix_yaml.get('include'): for tests in matrix:
a = tests.get('ansible') a = tests.get('ansible')
dn = tests.get('db_engine_name') dn = tests.get('db_engine_name')
dv = tests.get('db_engine_version') dv = tests.get('db_engine_version')