diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 0d139f3..82d72e9 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -14,7 +14,7 @@ Actually, the makefile only support Podman. I don't have tested with docker yet. The Makefile accept the following options: - ansible: Mandatory version of ansible to install in a venv to run ansible-test. -- container_image: +- docker_container: The container image to use to run our test. There images are created in github.com/community.mysql-test-containers and push the following images on quay.io: - my57-py38-pymysql093 - my57-py38-mysqlclient201-pymysql0711 @@ -45,10 +45,10 @@ Examples: ```sh # Run all targets -make ansible="stable-2.14" db_engine_version="mysql:5.7.40" connector="pymysql==0.7.10" python="3.8" container_image="my57-py38-mysqlclient201-pymysql0711" +make ansible="stable-2.14" db_engine_version="mysql:5.7.40" connector="pymysql==0.7.10" python="3.8" docker_container="my57-py38-mysqlclient201-pymysql0711" # A single target -make ansible="stable-2.14" db_engine_version="mysql:5.7.40" connector="pymysql==0.7.10" python="3.8" container_image="my57-py38-mysqlclient201-pymysql0711" target="test_mysql_db" +make ansible="stable-2.14" db_engine_version="mysql:5.7.40" connector="pymysql==0.7.10" python="3.8" docker_container="my57-py38-mysqlclient201-pymysql0711" target="test_mysql_db" ``` diff --git a/Makefile b/Makefile index 6ccb7c5..2614298 100644 --- a/Makefile +++ b/Makefile @@ -50,7 +50,7 @@ test-integration: python -m venv .venv/$(ansible) source .venv/$(ansible)/bin/activate python -m pip install --disable-pip-version-check --user https://github.com/ansible/ansible/archive/$(ansible).tar.gz ansible-test - -set -x; ansible-test integration $(target) -v --color --coverage --retry-on-error --continue-on-error --diff --docker $(docker_container) --docker-network podman --python $(python); set +x + -set -x; ansible-test integration $(target) -v --color --coverage --retry-on-error --continue-on-error --diff --docker localhost/community.mysql-$(docker_container):0.1.1 --docker-network podman --python $(python); set +x # -set -x; ansible-test integration $(target) -v --color --coverage --retry-on-error --continue-on-error --diff --docker $(docker_container) --docker-network podman --python $(python); set +x # -set -x; ansible-test integration $(target) -v --color --coverage --diff --docker $(docker_container) --docker-network podman --docker-terminate never --python $(python); set +x rm tests/integration/db_engine_version