openstack/kolla-ansible
Code Issues Proposed changes

podman: install "rich" dependency

Browse Source 
This dependency was added to podman-py in version 4.8.0, but not added
properly to their requirements. Install it explicitly for our tox
and integration testing as a workaround.

[0] https://github.com/containers/podman-py/issues/350

Change-Id: I61a5fdfc4e505f2577185f0c0f1297cf2709be2c
This commit is contained in:
Dr. Jens Harbott 2023-11-29 17:32:14 +01:00 committed by Michal Nasiadka
parent 0b7d9c368e
commit 0b1a59dd8c
2 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
tests/templates/globals-default.j2
View File

@ -17,6 +17,9 @@ kolla_container_engine: "{{ container_engine }}"
{% if container_engine == 'podman' %} {% if container_engine == 'podman' %}
podman_registry: "primary:4000" podman_registry: "primary:4000"
podman_registry_insecure: "yes" podman_registry_insecure: "yes"
podman_sdk_pip_packages:
- "podman>=4.7.0"
- rich
{% endif %} {% endif %}
docker_restart_policy: "no" docker_restart_policy: "no"
docker_custom_config: docker_custom_config:

1
tox.ini
View File

@ -13,6 +13,7 @@ deps = -c{env:TOX_CONSTRAINTS_FILE:https://releases.openstack.org/constraints/up
-r{toxinidir}/requirements.txt -r{toxinidir}/requirements.txt
-r{toxinidir}/test-requirements.txt -r{toxinidir}/test-requirements.txt
podman>=4.3.0,<5 podman>=4.3.0,<5
rich
passenv = http_proxy,HTTP_PROXY,https_proxy,HTTPS_PROXY,no_proxy,NO_PROXY, \ passenv = http_proxy,HTTP_PROXY,https_proxy,HTTPS_PROXY,no_proxy,NO_PROXY, \
OS_STDOUT_CAPTURE,OS_STDERR_CAPTURE,OS_LOG_CAPTURE,OS_TEST_TIMEOUT, \ OS_STDOUT_CAPTURE,OS_STDERR_CAPTURE,OS_LOG_CAPTURE,OS_TEST_TIMEOUT, \
PYTHON,OS_TEST_PATH,LISTOPT,IDOPTION PYTHON,OS_TEST_PATH,LISTOPT,IDOPTION