From 92105159e7cf6af5600410413c6542f312813c01 Mon Sep 17 00:00:00 2001
From: Ian Wienand <iwienand@redhat.com>
Date: Tue, 1 Mar 2022 11:29:03 +1100
Subject: [PATCH] ensure-podman: add containernetworking-plugins
I think this package is technically optional because you can run as
non-root without it. But since this is a generic role that is just
supposed to give you a working podman, include it.
Somehow we forgot to remove the podman centos-8 (not stream) job in
previous cleanups; remove it here.
Change-Id: I0a87545d29a5ea49a2d9d98c09467c89e7232d4b
---
roles/ensure-podman/tasks/Debian.yaml | 1 +
roles/ensure-podman/tasks/Ubuntu.yaml | 1 +
zuul-tests.d/container-roles-jobs.yaml | 11 -----------
3 files changed, 2 insertions(+), 11 deletions(-)
diff --git a/roles/ensure-podman/tasks/Debian.yaml b/roles/ensure-podman/tasks/Debian.yaml
index 96d018503..80603b13e 100644
--- a/roles/ensure-podman/tasks/Debian.yaml
+++ b/roles/ensure-podman/tasks/Debian.yaml
@@ -4,5 +4,6 @@
- podman
- uidmap
- slirp4netns
+ - containernetworking-plugins
state: present
become: yes
diff --git a/roles/ensure-podman/tasks/Ubuntu.yaml b/roles/ensure-podman/tasks/Ubuntu.yaml
index b4418d76c..b86a75f1f 100644
--- a/roles/ensure-podman/tasks/Ubuntu.yaml
+++ b/roles/ensure-podman/tasks/Ubuntu.yaml
@@ -14,6 +14,7 @@
- uidmap
- slirp4netns
- fuse-overlayfs
+ - containernetworking-plugins
state: present
become: yes
diff --git a/zuul-tests.d/container-roles-jobs.yaml b/zuul-tests.d/container-roles-jobs.yaml
index f11c904bd..5b03835ce 100644
--- a/zuul-tests.d/container-roles-jobs.yaml
+++ b/zuul-tests.d/container-roles-jobs.yaml
@@ -375,15 +375,6 @@
- test-playbooks/ensure-skopeo/.*
run: test-playbooks/ensure-skopeo/main.yaml
-- job:
- name: zuul-jobs-test-ensure-podman-centos-8
- description: Tests ensure-podman role on centos-8
- parent: zuul-jobs-test-ensure-podman
- nodeset:
- nodes:
- - name: centos-8
- label: centos-8
-
- job:
name: zuul-jobs-test-ensure-podman-centos-8-stream
description: Tests ensure-podman role on centos-8-stream
@@ -492,7 +483,6 @@
- zuul-jobs-test-registry-buildset-registry-openshift-docker
- zuul-jobs-test-ensure-kubernetes-docker
- zuul-jobs-test-ensure-kubernetes-crio
- - zuul-jobs-test-ensure-podman-centos-8
- zuul-jobs-test-ensure-podman-centos-8-stream
- zuul-jobs-test-ensure-podman-fedora-35
- zuul-jobs-test-ensure-podman-ubuntu-bionic
@@ -520,7 +510,6 @@
- zuul-jobs-test-registry-buildset-registry-openshift-docker
- zuul-jobs-test-ensure-kubernetes-docker
- zuul-jobs-test-ensure-kubernetes-crio
- - zuul-jobs-test-ensure-podman-centos-8
- zuul-jobs-test-ensure-podman-centos-8-stream
- zuul-jobs-test-ensure-podman-ubuntu-bionic
- zuul-jobs-test-ensure-podman-ubuntu-focal