diff --git a/schutzbot/vendor/87-podman-bridge.conflist b/schutzbot/vendor/87-podman-bridge.conflist deleted file mode 100644 index 5f4c94f..0000000 --- a/schutzbot/vendor/87-podman-bridge.conflist +++ /dev/null @@ -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" - } - ] -} diff --git a/schutzbot/vendor/README.md b/schutzbot/vendor/README.md deleted file mode 100644 index 31354d6..0000000 --- a/schutzbot/vendor/README.md +++ /dev/null @@ -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. diff --git a/schutzbot/vendor/dnsname b/schutzbot/vendor/dnsname deleted file mode 100755 index 22f03da..0000000 Binary files a/schutzbot/vendor/dnsname and /dev/null differ diff --git a/test/integration.sh b/test/integration.sh index 11a3dbd..6684beb 100755 --- a/test/integration.sh +++ b/test/integration.sh @@ -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