openstack/kolla-ansible
Code Issues Proposed changes

Merge "Revert "podman: install "rich" dependency""

Browse Source
This commit is contained in:
Zuul 2024-04-08 10:57:17 +00:00 committed by Gerrit Code Review
commit cc8658edb3
2 changed files with 0 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -19,9 +19,6 @@ docker_restart_policy: "no"
podman_debug: true podman_debug: true
podman_registry_mirrors: podman_registry_mirrors:
- {{ infra_dockerhub_mirror }} - {{ infra_dockerhub_mirror }}
podman_sdk_pip_packages:
- "podman>=4.7.0"
- rich
{% if need_build_image and is_previous_release %} {% if need_build_image and is_previous_release %}
podman_registry: "primary:4000" podman_registry: "primary:4000"
podman_registry_insecure: true podman_registry_insecure: true

1
tox.ini
View File

@ -13,7 +13,6 @@ 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