ansible-collections/community.mysql
1
0
Fork 0
mirror of https://github.com/ansible-collections/community.mysql.git synced 2025-08-03 04:34:27 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Fix venv not being used by keeping the same shell

Browse source 
Also fix "-set -x" command not found.
This commit is contained in:
Laurent Indermuehle 2023-04-24 09:01:23 +02:00
commit 630bd1d5f5
No known key found for this signature in database
GPG key ID: 93FA944C9F34DD09
1 changed files with 14 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

20
Makefile
View file

@ -86,12 +86,20 @@ test-integration:
while ! podman healthcheck run primary && [[ "$$SECONDS" -lt 120 ]]; do sleep 1; done while ! podman healthcheck run primary && [[ "$$SECONDS" -lt 120 ]]; do sleep 1; done
mkdir -p .venv/$(ansible) mkdir -p .venv/$(ansible)
python$(local_python_version) -m venv .venv/$(ansible) python$(local_python_version) -m venv .venv/$(ansible)
source .venv/$(ansible)/bin/activate
python$(local_python_version) -m ensurepip # Start venv (use `; \` to keep the same shell)
python$(local_python_version) -m pip install --disable-pip-version-check https://github.com/ansible/ansible/archive/$(ansible).tar.gz source .venv/$(ansible)/bin/activate; \
-set -x; ansible-test integration $(target) -v --color --coverage --diff \ python$(local_python_version) -m ensurepip; \
--docker ghcr.io/ansible-collections/community.mysql/test-container-$(db_client)-py$(python_version_flat)-$(connector_name)$(connector_version_flat):latest \ python$(local_python_version) -m pip install --disable-pip-version-check \
--docker-network podman $(_continue_on_errors) $(_keep_containers_alive) --python $(python); set +x 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-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_name
rm tests/integration/db_engine_version rm tests/integration/db_engine_version
rm tests/integration/connector_name rm tests/integration/connector_name