From 107030cc02a9660f7f64a3d8d69e0d145e69150b Mon Sep 17 00:00:00 2001 From: Tom Gundersen Date: Sun, 4 Oct 2020 15:15:54 +0100 Subject: [PATCH] test/cmd/koji: pull in podman-plugins explicitly This was made a weak dep, so we need to be explicit about it: ``` Author: Jonathan Lebon Commit: Lokesh Mandvekar spec: make podman-plugins a weak dep That way someone who wants just podman doesn't also get dnsmasq. This is a point of contention in FCOS currently: https://github.com/coreos/fedora-coreos-tracker/issues/519 (cherry picked from commit 217f4344ec796dd1134a5ba54a8ce2fb5a32a5b6) Signed-off-by: Lokesh Mandvekar ``` Signed-off-by: Tom Gundersen --- test/cmd/koji.sh | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/test/cmd/koji.sh b/test/cmd/koji.sh index 29c476665..ed58544b9 100755 --- a/test/cmd/koji.sh +++ b/test/cmd/koji.sh @@ -28,10 +28,12 @@ sudo dnf -y install \ python3 \ sssd-krb5 +greenprint "Adding podman dnsname plugin" if [[ $ID == rhel ]]; then - greenprint "Tweaking podman, maybe." sudo cp /usr/share/tests/osbuild-composer/vendor/87-podman-bridge.conflist /etc/cni/net.d/ sudo cp /usr/share/tests/osbuild-composer/vendor/dnsname /usr/libexec/cni/ +else + sudo dnf -y install podman-plugins fi greenprint "Starting containers"