particle-os/debian-forge-composer
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

test/cmd/koji: pull in podman-plugins explicitly

Browse source 
This was made a weak dep, so we need to be explicit about it:

```
Author:     Jonathan Lebon <jonathan@jlebon.com>
Commit:     Lokesh Mandvekar <lsm5@fedoraproject.org>

    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 <lsm5@fedoraproject.org>
```

Signed-off-by: Tom Gundersen <teg@jklm.no>
This commit is contained in:
Tom Gundersen 2020-10-04 15:15:54 +01:00 • committed by Ondřej Budai
parent dae0f86b35
commit 107030cc02
1 changed files with 3 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

4
test/cmd/koji.sh
View file

@ -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"