From 638a5296d52d4082fc59fcafff0430ff1153ce13 Mon Sep 17 00:00:00 2001 From: "Chandan Kumar (raukadah)" Date: Tue, 10 Mar 2020 10:00:40 +0530 Subject: [PATCH] Set overcloud_container_cli to podman for c8 It also runs c8 multinode on fs030 changes. Depends-On: https://review.opendev.org/713397 Change-Id: I594235ac06df98c1f9615cc6307d43ff7fce93c6 Signed-off-by: Chandan Kumar (raukadah) --- config/general_config/featureset030.yml | 7 ++++++- zuul.d/layout.yaml | 3 +++ 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/config/general_config/featureset030.yml b/config/general_config/featureset030.yml index 7d94f4547..7eda22721 100644 --- a/config/general_config/featureset030.yml +++ b/config/general_config/featureset030.yml @@ -88,7 +88,12 @@ test_ping: false test_white_regex: '' tempest_whitelist: - 'tempest.scenario.test_network_basic_ops.TestNetworkBasicOps.test_network_basic_ops' -overcloud_container_cli: docker +overcloud_container_cli: >- + {% if release not in ['pike', 'queens', 'rocky', 'stein', 'rocky', 'train'] -%} + podman + {%- else -%} + docker + {%- endif -%} # os_tempest setting # Settings for os_tempest diff --git a/zuul.d/layout.yaml b/zuul.d/layout.yaml index 53256946e..396e783be 100644 --- a/zuul.d/layout.yaml +++ b/zuul.d/layout.yaml @@ -13,6 +13,9 @@ - tripleo-ci-centos-7-scenario007-multinode-oooq-container: files: - config/general_config/featureset030.yml + - tripleo-ci-centos-8-scenario007-multinode-oooq-container: + files: + - config/general_config/featureset030.yml - tripleo-ci-centos-7-scenario009-multinode-oooq-container: files: - config/general_config/featureset033.yml