diff --git a/osbuild-composer.spec b/osbuild-composer.spec index 492d578f1..c9c0c2ce9 100644 --- a/osbuild-composer.spec +++ b/osbuild-composer.spec @@ -219,12 +219,6 @@ install -m 0644 -vp test/data/koji/* %{buildroot}%{_d install -m 0755 -vd %{buildroot}%{_datadir}/tests/osbuild-composer/x509 install -m 0644 -vp test/data/x509/* %{buildroot}%{_datadir}/tests/osbuild-composer/x509/ -%if 0%{?rhel} -install -m 0755 -vd %{buildroot}%{_datadir}/tests/osbuild-composer/vendor -install -m 0644 -vp test/data/vendor/87-podman-bridge.conflist %{buildroot}%{_datadir}/tests/osbuild-composer/vendor/ -install -m 0755 -vp test/data/vendor/dnsname %{buildroot}%{_datadir}/tests/osbuild-composer/vendor/ -%endif - %endif %check @@ -341,8 +335,8 @@ Requires: expect Requires: python3-lxml Requires: httpd Requires: openssl -%if 0%{?fedora} Requires: podman-plugins +%if 0%{?fedora} # koji and ansible are not in RHEL repositories. Depending on them breaks RHEL # gating (see OSCI-1541). The test script must enable EPEL and install those # packages manually. diff --git a/test/cases/koji.sh b/test/cases/koji.sh index 6fc36bd72..89e949a81 100755 --- a/test/cases/koji.sh +++ b/test/cases/koji.sh @@ -24,12 +24,6 @@ else DISTRO_SELECTOR="${ID}-${VERSION_ID%.*}" fi -greenprint "Adding podman dnsname plugin" -if [[ $ID == rhel || $ID == centos ]]; then - 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/ -fi - greenprint "Starting containers" sudo /usr/libexec/osbuild-composer-test/run-koji-container.sh start diff --git a/test/data/vendor/87-podman-bridge.conflist b/test/data/vendor/87-podman-bridge.conflist deleted file mode 100644 index 5f4c94f53..000000000 --- a/test/data/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/test/data/vendor/README.md b/test/data/vendor/README.md deleted file mode 100644 index 31354d6e9..000000000 --- a/test/data/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/test/data/vendor/dnsname b/test/data/vendor/dnsname deleted file mode 100755 index 566f7e856..000000000 Binary files a/test/data/vendor/dnsname and /dev/null differ