test: pull podman-plugins from internal RHEL repo

Instead of taking podman-plugins from the source directory, use the one
that will be released into RHEL 8.3.1.

This will simplify moving tests into an rpm.
This commit is contained in:
Lars Karlitski 2020-11-18 19:40:59 +01:00
parent c2b5bd7060
commit ade02b0c9a
4 changed files with 11 additions and 52 deletions

View file

@ -1,41 +0,0 @@
{
"cniVersion": "0.4.0",
"name": "podman",
"plugins": [
{
"type": "bridge",
"bridge": "cni-podman0",
"isGateway": true,
"ipMasq": true,
"hairpinMode": true,
"ipam": {
"type": "host-local",
"routes": [{ "dst": "0.0.0.0/0" }],
"ranges": [
[
{
"subnet": "10.88.0.0/16",
"gateway": "10.88.0.1"
}
]
]
}
},
{
"type": "portmap",
"capabilities": {
"portMappings": true
}
},
{
"type": "firewall"
},
{
"type": "tuning"
},
{
"domainName": "dns.podman",
"type": "dnsname"
}
]
}

View file

@ -1,9 +0,0 @@
This directory includes 3rd party modules, needed in CI.
- [`dnsname`](https://github.com/containers/dnsname) plugin for podman,
needed to translate host names of containers into IPs. It is shipped
in Fedora, but missing in RHEL 8, see
[rhgbz#1877865](https://bugzilla.redhat.com/show_bug.cgi?id=1877865).
The `87-podman-bridge.conflist` file contains the corresponding config,
where the `{"domainName": "dns.podman", "type": "dnsname"}` bit is the
newly added part.

Binary file not shown.

View file

@ -25,10 +25,19 @@ sudo dnf -y install \
koji-osbuild-cli \
podman
# HACK: podman-plugins was only recently added to RHEL. Fetch it from the
# internal RHEL 8.3.1 repository until that is released.
greenprint "Install the podman dnsname plugin"
if [[ $ID == rhel ]]; then
sudo cp schutzbot/vendor/87-podman-bridge.conflist /etc/cni/net.d/
sudo cp schutzbot/vendor/dnsname /usr/libexec/cni/
sudo tee /etc/yum.repos.d/rhel-8-3-1.repo << EOF
[rhel-8-3-1]
name = RHEL 8.3.1 override
baseurl = http://download.devel.redhat.com/rhel-8/nightly/RHEL-8/RHEL-8.3.1-20201118.n.0/compose/AppStream/x86_64/os
enabled = 0
gpgcheck = 1
EOF
sudo dnf -y install '--disablerepo=*' --enablerepo=rhel-8-3-1 podman-plugins
else
sudo dnf -y install podman-plugins
fi