From: Cédric Ollivier Date: Sat, 29 Mar 2025 14:37:50 +0000 (+0100) Subject: Revert "Gate podman" X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=refs%2Fchanges%2F35%2F74835%2F1;p=releng.git Revert "Gate podman" This reverts commit 24123fb508f69d2eceeefc63238cefc7099a6dce. Change-Id: I157bc9d369ee3d870ca9723fb05e30269b80f327 Signed-off-by: Cédric Ollivier --- 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