Skip to content

refactor: Remove RHEL-8 workarounds from tests #3

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
google-labs-jules wants to merge 1 commit into
base: main
Choose a base branch
from
Draft

refactor: Remove RHEL-8 workarounds from tests #3

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 0 additions & 7 deletions tests/prepare/install/data/epel8-remote.fmf
View file
Open in desktop

This file was deleted.

23 changes: 5 additions & 18 deletions tests/prepare/install/data/existing.fmf
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
18 changes: 2 additions & 16 deletions tests/prepare/install/test.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down Expand Up @@ -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

Expand Down Expand Up @@ -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
Expand All @@ -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
Expand Down