From 325c8fce46bee0b5046b2c5ae732678aeeec6629 Mon Sep 17 00:00:00 2001 From: Kefu Chai Date: Mon, 22 Mar 2021 14:49:13 +0800 Subject: [PATCH] qa/distros/podman: install containernetworking-plugins along with podman /etc/cni/net.d/87-podman-bridge.conflist tries to load "bridge", "firewall", "tuning" and "portmap" plugins, which are provided by containernetworking-plugins package. Fixes: https://tracker.ceph.com/issues/49909 Signed-off-by: Kefu Chai --- qa/distros/podman/ubuntu_20.04_kubic_stable.yaml | 2 +- qa/distros/podman/ubuntu_20.04_kubic_testing.yaml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/qa/distros/podman/ubuntu_20.04_kubic_stable.yaml b/qa/distros/podman/ubuntu_20.04_kubic_stable.yaml index a02a4c33dc6..2eae5e2a347 100644 --- a/qa/distros/podman/ubuntu_20.04_kubic_stable.yaml +++ b/qa/distros/podman/ubuntu_20.04_kubic_stable.yaml @@ -8,5 +8,5 @@ tasks: - curl -L https://download.opensuse.org/repositories/devel:/kubic:/libcontainers:/stable/xUbuntu_20.04/Release.key | sudo apt-key add - - echo "deb https://download.opensuse.org/repositories/devel:/kubic:/libcontainers:/stable/xUbuntu_20.04/ /" | sudo tee /etc/apt/sources.list.d/devel:kubic:libcontainers:stable.list - sudo apt update - - sudo apt -y -o Dpkg::Options::="--force-confdef" -o Dpkg::Options::="--force-confold" install podman + - sudo apt -y -o Dpkg::Options::="--force-confdef" -o Dpkg::Options::="--force-confold" install podman containernetworking-plugins - echo -e "[[registry]]\nlocation = 'docker.io'\n\n[[registry.mirror]]\nlocation='docker-mirror.front.sepia.ceph.com:5000'\n" | sudo tee /etc/containers/registries.conf diff --git a/qa/distros/podman/ubuntu_20.04_kubic_testing.yaml b/qa/distros/podman/ubuntu_20.04_kubic_testing.yaml index eb804120e25..1844f4ebf81 100644 --- a/qa/distros/podman/ubuntu_20.04_kubic_testing.yaml +++ b/qa/distros/podman/ubuntu_20.04_kubic_testing.yaml @@ -8,5 +8,5 @@ tasks: - curl -L https://download.opensuse.org/repositories/devel:/kubic:/libcontainers:/testing/xUbuntu_20.04/Release.key | sudo apt-key add - - echo "deb https://download.opensuse.org/repositories/devel:/kubic:/libcontainers:/testing/xUbuntu_20.04/ /" | sudo tee /etc/apt/sources.list.d/devel:kubic:libcontainers:testing.list - sudo apt update - - sudo apt -y -o Dpkg::Options::="--force-confdef" -o Dpkg::Options::="--force-confold" install podman + - sudo apt -y -o Dpkg::Options::="--force-confdef" -o Dpkg::Options::="--force-confold" install podman containernetworking-plugins - echo -e "[[registry]]\nlocation = 'docker.io'\n\n[[registry.mirror]]\nlocation='docker-mirror.front.sepia.ceph.com:5000'\n" | sudo tee /etc/containers/registries.conf -- 2.39.5