From dba9c11e998728f6daddd6873960831d7c28c14a Mon Sep 17 00:00:00 2001 From: =?utf8?q?C=C3=A9dric=20Ollivier?= Date: Sat, 29 Mar 2025 15:37:50 +0100 Subject: [PATCH] Revert "Gate podman" MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit This reverts commit 24123fb508f69d2eceeefc63238cefc7099a6dce. Change-Id: I157bc9d369ee3d870ca9723fb05e30269b80f327 Signed-off-by: Cédric Ollivier --- jjb/functest/xtesting-ci.yaml | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/jjb/functest/xtesting-ci.yaml b/jjb/functest/xtesting-ci.yaml index 553c56e67..5df2fe61f 100644 --- a/jjb/functest/xtesting-ci.yaml +++ b/jjb/functest/xtesting-ci.yaml @@ -234,8 +234,7 @@ -v /home/opnfv/.docker/config.json:/home/opnfv/.config/helm/registry/config.json \ -v /data:/data -v /var/run/docker.sock:/var/run/docker.sock --network host debian:{debian} bash -c "\ apt update && DEBIAN_FRONTEND=noninteractive apt \ - -o DPkg::Lock::Timeout=300 install git podman ca-certificates -y && \ - sed -i "s/^\#.*cgroups\ =.*$/cgroups = no-conmon/" /usr/share/containers/containers.conf && \ + -o DPkg::Lock::Timeout=300 install git -y && \ case {debian} in \ bullseye) \ [ -z "$VIRTUAL_ENV" ] && DEBIAN_FRONTEND=noninteractive apt \ @@ -280,7 +279,6 @@ playbook: - all - kubernetes0 - - podman node: xtesting release: - stable -- 2.16.6