Re-enable integration tests to validate db_engine_version is fixed

This commit is contained in:
Laurent Indermuehle 2023-01-06 10:06:36 +01:00
parent 192680888c
commit 9d3ce94e4d
No known key found for this signature in database
GPG key ID: 93FA944C9F34DD09
2 changed files with 47 additions and 52 deletions

View file

@ -35,8 +35,7 @@ jobs:
# pull-request-change-detection: true # pull-request-change-detection: true
integration: integration:
# name: "Integration (Python: ${{ matrix.python }}, Ansible: ${{ matrix.ansible }}, MySQL: ${{ matrix.db_engine_version }}, Connector: ${{ matrix.connector }})" name: "Integration (Python: ${{ matrix.python }}, Ansible: ${{ matrix.ansible }}, MySQL: ${{ matrix.db_engine_version }}, Connector: ${{ matrix.connector }})"
name: "Integration (Python: ${{ matrix.python }}, Ansible: ${{ matrix.ansible }}, Connector: ${{ matrix.connector }})"
runs-on: ubuntu-20.04 runs-on: ubuntu-20.04
strategy: strategy:
fail-fast: false fail-fast: false
@ -116,23 +115,20 @@ jobs:
run: run:
sleep 20; sleep 20;
- name: Send Matrix variables to the virtual machine using text files
run: >-
echo Setting db_engine_version to ${{ matrix.db_engine_version }}...;
echo -n "${{ matrix.db_engine_version }}" > tests/integration/db_engine_version;
echo Setting Connector version to ${{ matrix.connector }}...;
echo -n "${{ matrix.connector }}" > tests/integration/connector
- name: >- - name: >-
Perform integration testing against Perform integration testing against
Ansible version ${{ matrix.ansible }} Ansible version ${{ matrix.ansible }}
under Python ${{ matrix.python }} under Python ${{ matrix.python }}
uses: ansible-community/ansible-test-gh-action@release/v1 uses: ansible-community/ansible-test-gh-action@release/v1
pre-test-cmd: >-
echo Setting db_engine_version to "${{ matrix.db_engine_version }}"...;
echo -n "${{ matrix.db_engine_version }}" > tests/integration/db_engine_version;
echo Setting Connector version to "${{ matrix.connector }}"...;
echo -n "${{ matrix.connector }}" > tests/integration/connector
with: with:
ansible-core-version: ${{ matrix.ansible }} ansible-core-version: ${{ matrix.ansible }}
target-python-version: ${{ matrix.python }} target-python-version: ${{ matrix.python }}
testing-type: integration testing-type: integration
target: test_mysql_info
# units: # units:
# runs-on: ubuntu-20.04 # runs-on: ubuntu-20.04

View file

@ -2,45 +2,44 @@
test-integration: test-integration:
echo -n mysql:8.0.22 > tests/integration/db_engine_version echo -n mysql:8.0.22 > tests/integration/db_engine_version
echo -n pymysql==0.9.3 > tests/integration/connector echo -n pymysql==0.9.3 > tests/integration/connector
# podman run \ podman run \
# --detach \ --detach \
# --name primary \ --name primary \
# --env MARIADB_ROOT_PASSWORD=msandbox \ --env MARIADB_ROOT_PASSWORD=msandbox \
# --env MYSQL_ROOT_PASSWORD=msandbox \ --env MYSQL_ROOT_PASSWORD=msandbox \
# --network podman \ --network podman \
# --publish 3307:3306 \ --publish 3307:3306 \
# --health-cmd 'mysqladmin ping -P 3306 -pmsandbox | grep alive || exit 1' \ --health-cmd 'mysqladmin ping -P 3306 -pmsandbox | grep alive || exit 1' \
# mysql:8.0.22 mysql:8.0.22
# podman run \ podman run \
# --detach \ --detach \
# --name replica1 \ --name replica1 \
# --env MARIADB_ROOT_PASSWORD=msandbox \ --env MARIADB_ROOT_PASSWORD=msandbox \
# --env MYSQL_ROOT_PASSWORD=msandbox \ --env MYSQL_ROOT_PASSWORD=msandbox \
# --network podman \ --network podman \
# --publish 3308:3306 \ --publish 3308:3306 \
# --health-cmd 'mysqladmin ping -P 3306 -pmsandbox | grep alive || exit 1' \ --health-cmd 'mysqladmin ping -P 3306 -pmsandbox | grep alive || exit 1' \
# --security-opt label=disable \ --security-opt label=disable \
# --volume ./tests/integration/targets/setup_mysql/replica1/:/etc/mysql/conf.d/ \ --volume ./tests/integration/targets/setup_mysql/replica1/:/etc/mysql/conf.d/ \
# mysql:8.0.22 mysql:8.0.22
# podman run \ podman run \
# --detach \ --detach \
# --name replica2 \ --name replica2 \
# --env MARIADB_ROOT_PASSWORD=msandbox \ --env MARIADB_ROOT_PASSWORD=msandbox \
# --env MYSQL_ROOT_PASSWORD=msandbox \ --env MYSQL_ROOT_PASSWORD=msandbox \
# --network podman \ --network podman \
# --publish 3309:3306 \ --publish 3309:3306 \
# --health-cmd 'mysqladmin ping -P 3306 -pmsandbox | grep alive || exit 1' \ --health-cmd 'mysqladmin ping -P 3306 -pmsandbox | grep alive || exit 1' \
# --security-opt label=disable \ --security-opt label=disable \
# --volume ./tests/integration/targets/setup_mysql/replica2/:/etc/mysql/conf.d/ \ --volume ./tests/integration/targets/setup_mysql/replica2/:/etc/mysql/conf.d/ \
# mysql:8.0.22 mysql:8.0.22
# while ! podman healthcheck run primary && [[ "$$SECONDS" -lt 120 ]]; do sleep 1; done while ! podman healthcheck run primary && [[ "$$SECONDS" -lt 120 ]]; do sleep 1; done
# -set -x; ansible-test integration -v --color --coverage --retry-on-error --continue-on-error --diff --docker --docker-network podman --python 3.8; set +x -set -x; ansible-test integration -v --color --coverage --retry-on-error --continue-on-error --diff --docker --docker-network podman --python 3.8; set +x
-set -x; ansible-test integration test_mysql_info -v --color --coverage --diff --docker --docker-network podman --docker-terminate never --python 3.8; set +x rm tests/integration/db_engine_version
# rm tests/integration/db_engine_version rm tests/integration/connector
# rm tests/integration/connector podman stop --time 0 --ignore primary
# podman stop --time 0 --ignore primary podman stop --time 0 --ignore replica1
# podman stop --time 0 --ignore replica1 podman stop --time 0 --ignore replica2
# podman stop --time 0 --ignore replica2 podman rm --ignore primary
# podman rm --ignore primary podman rm --ignore replica1
# podman rm --ignore replica1 podman rm --ignore replica2
# podman rm --ignore replica2