diff --git a/.github/workflows/ansible-test-plugins.yml b/.github/workflows/ansible-test-plugins.yml index 64435cd..79c7150 100644 --- a/.github/workflows/ansible-test-plugins.yml +++ b/.github/workflows/ansible-test-plugins.yml @@ -50,14 +50,15 @@ jobs: working-directory: ./ansible_collections/community/mysql integration: - name: "Integration (Python: ${{ matrix.python }}, Ansible: ${{ matrix.ansible }}, MySQL: ${{ matrix.mysql }}, Connector: ${{ matrix.connector }})" + name: "Integration (Python: ${{ matrix.python }}, Ansible: ${{ matrix.ansible }}, MySQL: ${{ matrix.db_engine_version }}, Connector: ${{ matrix.connector }})" runs-on: ubuntu-latest strategy: fail-fast: false matrix: - mysql: - - 5.7.31 - - 8.0.22 + db_engine_version: + - mysql_5.7.31 + - mysql_8.0.22 + - mariadb_10.5.4 ansible: - stable-2.9 - stable-2.10 @@ -72,7 +73,7 @@ jobs: - pymysql==0.9.3 - mysqlclient==2.0.1 exclude: - - mysql: 8.0.22 + - db_engine_version: mysql_8.0.22 connector: pymysql==0.7.10 - python: 3.8 ansible: stable-2.9 @@ -100,8 +101,17 @@ jobs: - name: Install ansible-base (${{ matrix.ansible }}) run: pip install https://github.com/ansible/ansible/archive/${{ matrix.ansible }}.tar.gz --disable-pip-version-check - - name: Set MySQL version (${{ matrix.mysql }}) - run: "sed -i 's/^mysql_version:.*/mysql_version: \"${{ matrix.mysql }}\"/g' ${{ env.mysql_version_file }}" + - name: Set MySQL version (${{ matrix.db_engine_version }}) + run: | + export DB_VERSION=$(echo "${{ matrix.db_engine_version }}" | awk -F_ '{print $2}') + sed -i "s/^mysql_version:.*/mysql_version: $DB_VERSION/g" ${{ env.mysql_version_file }} + if: ${{ startsWith(db_engine_version, 'mysql') }} + + - name: Set MariaDB version (${{ matrix.db_engine_version }}) + run: | + export DB_VERSION=$(echo "${{ matrix.db_engine_version }}" | awk -F_ '{print $2}') + sed -i -e "s/^mariadb_version:.*/mariadb_version: $DB_VERSION/g" -e 's/^mariadb_install: false/mariadb_install: true/g' ${{ env.mariadb_version_file }} + if: ${{ startsWith(db_engine_version, 'mariadb') }} - name: Set Connector version (${{ matrix.connector }}) run: "sed -i 's/^python_packages:.*/python_packages: [${{ matrix.connector }}]/' ${{ env.connector_version_file }}"