diff --git a/tests/prepare/install/data/epel8-remote.fmf b/tests/prepare/install/data/epel8-remote.fmf deleted file mode 100644 index c15332c1a8..0000000000 --- a/tests/prepare/install/data/epel8-remote.fmf +++ /dev/null @@ -1,7 +0,0 @@ -prepare: - how: install - package: - - https://dl.fedoraproject.org/pub/epel/epel-release-latest-8.noarch.rpm -execute: - how: tmt - script: rpm -q epel-release diff --git a/tests/prepare/install/data/existing.fmf b/tests/prepare/install/data/existing.fmf index b9718cb589..bf32c6afc9 100644 --- a/tests/prepare/install/data/existing.fmf +++ b/tests/prepare/install/data/existing.fmf @@ -1,24 +1,11 @@ summary: Install existing packages -prepare: [] - +prepare: + - how: install + package: + - tree + - diffutils adjust: - when: distro == ubuntu,debian prepare+<: - how: shell script: apt-get update - - # Applies to every distro... - - when: distro != rhel-8 - prepare+: - - how: install - package: - - tree - - diffutils - - # ... except UBI8 which is a RHEL-8. - - when: distro == rhel-8 - prepare+: - - how: install - package: - - dconf - - libpng diff --git a/tests/prepare/install/test.sh b/tests/prepare/install/test.sh index 891296de6c..7e662213df 100755 --- a/tests/prepare/install/test.sh +++ b/tests/prepare/install/test.sh @@ -119,10 +119,6 @@ rlJournalStart fi - elif is_ubi_8 "$image"; then - rlRun "distro=rhel-8" - rlRun "package_manager=dnf" - elif is_alpine "$image"; then rlRun "distro=alpine" rlRun "package_manager=apk" @@ -156,11 +152,7 @@ rlJournalStart fi rlPhaseStartTest "$phase_prefix Install existing packages (CLI)" - if is_ubi "$image"; then - rlRun -s "$tmt --insert --how install --package dconf --package libpng plan --name /empty" - else - rlRun -s "$tmt --insert --how install --package tree --package diffutils plan --name /empty" - fi + rlRun -s "$tmt --insert --how install --package tree --package diffutils plan --name /empty" rlAssertGrep "package manager: $package_manager$" $rlRun_LOG @@ -317,7 +309,7 @@ rlJournalStart # TODO: at least copr is RH-specific, but package name escaping and debuginfo should be # possible to extend to other distros. if (is_fedora "$image" && ! is_fedora_coreos "$image") || is_centos "$image" || is_ubi "$image"; then - if ! is_centos_7 "$image" && ! is_ubi_8 "$image"; then + if ! is_centos_7 "$image"; then rlPhaseStartTest "$phase_prefix Just enable copr" rlRun "$tmt execute plan --name copr" rlPhaseEnd @@ -343,12 +335,6 @@ rlJournalStart rlPhaseEnd fi - if is_ubi_8 "$image"; then - rlPhaseStartTest "$phase_prefix Install remote packages" - rlRun "$tmt execute plan --name epel8-remote" - rlPhaseEnd - fi - rlPhaseStartTest "$phase_prefix Install debuginfo packages" rlRun "$tmt execute plan --name debuginfo" rlPhaseEnd