Revert "Revert "(squash) disabling podman everywhere in gate""

Related-Bug: #1803232
This reverts commit 9989134abc.

Change-Id: Ia0b9ba83223ef2c83ff69999bd0b1c9894796d1b
This commit is contained in:
Emilien Macchi 2018-11-14 01:05:47 +00:00
parent e7ff1a4fdd
commit 0eb6f366d0
3 changed files with 1 additions and 20 deletions

View File

@ -94,9 +94,4 @@ undercloud_enable_tempest: >-
false
{%- endif -%}
undercloud_container_cli: >-
{% if release in ['rocky'] -%}
docker
{%- else -%}
podman
{%- endif -%}

View File

@ -125,10 +125,3 @@ mistral_test_black_regex:
- 'mistral_tempest_tests.tests.scenario.engine.actions.v2.test_ssh_actions.SSHActionsTestsV2.test_run_ssh_proxied_action'
- 'mistral_tempest_tests.tests.scenario.engine.actions.v2.test_openstack_actions.OpenStackActionsTestsV2.test_swift_actions'
- 'mistral_tempest_tests.tests.scenario.engine.actions.v2.test_multi_vim_authentication.MultiVimActionsTests.test_multi_vim_support_target_headers'
undercloud_container_cli: >-
{% if release in ['rocky'] -%}
docker
{%- else -%}
podman
{%- endif -%}

View File

@ -24,10 +24,3 @@ run_tempest: false
# configured public-vip and admin-vip.
undercloud_generate_service_certificate: true
undercloud_enable_swift_encryption: true
undercloud_container_cli: >-
{% if release in ['rocky'] -%}
docker
{%- else -%}
podman
{%- endif -%}