diff --git a/.github/workflows/flow.yml b/.github/workflows/flow.yml index 73e3855a4..381f8a2a1 100644 --- a/.github/workflows/flow.yml +++ b/.github/workflows/flow.yml @@ -34,9 +34,9 @@ jobs: matrix: runner: [ubuntu-latest-16-cores] db-version: [ - {pg: 16, mysql: 'mysql-gtid', mongo: '6.0', ch: 'lts'}, - {pg: 17, mysql: 'mysql-pos', mongo: '7.0', ch: 'stable'}, - {pg: 18, mysql: 'maria-gtid', mongo: '8.0', ch: 'latest'}, + {pg: 16, mysql: 'mysql-gtid', mariadb: 'maria-9', mongo: '6.0', ch: 'lts'}, + {pg: 17, mysql: 'mysql-pos', mariadb: 'maria-12', mongo: '7.0', ch: 'stable'}, + {pg: 18, mysql: 'mysql-gtid', mariadb: 'maria-13', mongo: '8.0', ch: 'latest'}, ] # Per-version container settings consumed by the "MySQL" step, keyed by the matrix # db-version.mysql value. Grouped under "mysql" since these are MySQL/MariaDB families; @@ -52,12 +52,17 @@ jobs: img: 'mysql:5.7' env: ['MYSQL_ROOT_PASSWORD=cipass'] parameters: ['--log_bin=mysql-bin', '--server-id=1', '--bind-address=::'] - maria-pos: - img: 'mariadb:lts-ubi9@sha256:55a81b2d791d2ff8ad33fef413d9e45e0ac57a951127e0cfc69a8e59f922ba6e' + - mariadb: + maria-9: + img: 'mariadb:lts-ubi9' env: ['MARIADB_ROOT_PASSWORD=cipass'] - parameters: ['--log-bin=maria'] - maria-gtid: - img: 'mariadb:lts-ubi9@sha256:55a81b2d791d2ff8ad33fef413d9e45e0ac57a951127e0cfc69a8e59f922ba6e' + parameters: ['--log-bin=maria', '--gtid-strict-mode=ON'] + maria-12: + img: 'mariadb:12-ubi' + env: ['MARIADB_ROOT_PASSWORD=cipass'] + parameters: ['--log-bin=maria', '--gtid-strict-mode=ON'] + maria-13: + img: 'mariadb:13.0-ubi-rc' env: ['MARIADB_ROOT_PASSWORD=cipass'] parameters: ['--log-bin=maria', '--gtid-strict-mode=ON'] runs-on: ${{ matrix.runner }} @@ -221,6 +226,15 @@ jobs: docker run -d --rm --name mysql --network ${{ job.container.network }} -p 3306:3306 \ -e $DB_ENV $DB_IMG $DB_PARAMS + - name: MariaDB + env: + DB_IMG: ${{ matrix.version-configs.mariadb[matrix.db-version.mariadb].img }} + DB_ENV: ${{ join(matrix.version-configs.mariadb[matrix.db-version.mariadb].env, ' -e ') }} + DB_PARAMS: ${{ join(matrix.version-configs.mariadb[matrix.db-version.mariadb].parameters, ' ') }} + run: | + docker run -d --rm --name mariadb --network ${{ job.container.network }} -p 3316:3306 \ + -e $DB_ENV $DB_IMG $DB_PARAMS + - name: Mongo run: | echo "starting mongoDB..." @@ -630,6 +644,7 @@ jobs: PEERDB_QUEUE_FORCE_TOPIC_CREATION: "true" ELASTICSEARCH_TEST_ADDRESS: http://localhost:9200 CI_PG_VERSION: ${{ matrix.db-version.pg }} + CI_MARIADB_VERSION: ${{ matrix.db-version.mariadb }} CI_MYSQL_VERSION: ${{ matrix.db-version.mysql }} CI_MONGO_ADMIN_URI: mongodb://localhost:27017 CI_MONGO_ADMIN_USERNAME: "admin"