mirror of
https://github.com/ansible-collections/community.mysql.git
synced 2025-08-21 13:31:45 -07:00
Embed pymysql
within the collection and use default test container
This change eliminates the need to install the connector on each controlled node, as `pymysql` version 1.1.1 is now included. As a result, we can safely assume its availability, thus simplifying the testing process. Also, I managed to remove the need for pre-built test containers. We now use the default test containers from ansible-test.
This commit is contained in:
parent
16d530348d
commit
04af62c400
49 changed files with 4392 additions and 979 deletions
10
Makefile
10
Makefile
|
@ -15,9 +15,6 @@ endif
|
|||
db_ver_tuple := $(subst ., , $(db_engine_version))
|
||||
db_engine_version_flat := $(word 1, $(db_ver_tuple))$(word 2, $(db_ver_tuple))
|
||||
|
||||
con_ver_tuple := $(subst ., , $(connector_version))
|
||||
connector_version_flat := $(word 1, $(con_ver_tuple))$(word 2, $(con_ver_tuple))$(word 3, $(con_ver_tuple))
|
||||
|
||||
py_ver_tuple := $(subst ., , $(python))
|
||||
python_version_flat := $(word 1, $(py_ver_tuple))$(word 2, $(py_ver_tuple))
|
||||
|
||||
|
@ -32,8 +29,6 @@ endif
|
|||
test-integration:
|
||||
@echo -n $(db_engine_name) > tests/integration/db_engine_name
|
||||
@echo -n $(db_engine_version) > tests/integration/db_engine_version
|
||||
@echo -n $(connector_name) > tests/integration/connector_name
|
||||
@echo -n $(connector_version) > tests/integration/connector_version
|
||||
@echo -n $(python) > tests/integration/python
|
||||
@echo -n $(ansible) > tests/integration/ansible
|
||||
|
||||
|
@ -94,16 +89,13 @@ test-integration:
|
|||
https://github.com/ansible/ansible/archive/$(ansible).tar.gz; \
|
||||
set -x; \
|
||||
ansible-test integration $(target) -v --color --coverage --diff \
|
||||
--docker ghcr.io/ansible-collections/community.mysql/test-container\
|
||||
-$(db_client)-py$(python_version_flat)-$(connector_name)$(connector_version_flat):latest \
|
||||
--docker \
|
||||
--docker-network podman $(_continue_on_errors) $(_keep_containers_alive) --python $(python); \
|
||||
set +x
|
||||
# End of venv
|
||||
|
||||
rm tests/integration/db_engine_name
|
||||
rm tests/integration/db_engine_version
|
||||
rm tests/integration/connector_name
|
||||
rm tests/integration/connector_version
|
||||
rm tests/integration/python
|
||||
rm tests/integration/ansible
|
||||
ifndef keep_containers_alive
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue