Skip to content

Commit

Permalink
Remove rest of f-39 container usage, update if possible to 41
Browse files Browse the repository at this point in the history
  • Loading branch information
lukaszachy authored and psss committed Feb 12, 2025
1 parent 92b0a73 commit 4d471dd
Show file tree
Hide file tree
Showing 6 changed files with 4 additions and 86 deletions.
22 changes: 0 additions & 22 deletions containers/fedora/39/Containerfile

This file was deleted.

26 changes: 0 additions & 26 deletions containers/fedora/39/Containerfile.unprivileged

This file was deleted.

17 changes: 0 additions & 17 deletions containers/fedora/39/Containerfile.upstream

This file was deleted.

10 changes: 2 additions & 8 deletions tests/prepare/install/test.sh
Original file line number Diff line number Diff line change
Expand Up @@ -154,7 +154,7 @@ rlJournalStart
fi
rlPhaseEnd

if rlIsFedora 39 && is_fedora_39 "$image"; then
if rlIsFedora 41 && is_fedora_41 "$image"; then
rlPhaseStartTest "$phase_prefix Install downloaded packages from current directory (plan)"
fetch_downloaded_packages "$image"

Expand Down Expand Up @@ -239,9 +239,6 @@ rlJournalStart
elif is_fedora_40 "$image"; then
rlAssertGrep "err: Error: Unable to find a match: tree-but-spelled-wrong" $rlRun_LOG

elif is_fedora_39 "$image"; then
rlAssertGrep "err: Error: Unable to find a match: tree-but-spelled-wrong" $rlRun_LOG

elif is_ubuntu "$image" || is_debian "$image"; then
rlAssertGrep "err: E: Unable to locate package tree-but-spelled-wrong" $rlRun_LOG

Expand Down Expand Up @@ -276,9 +273,6 @@ rlJournalStart
elif is_fedora_40 "$image"; then
rlAssertGrep "err: Error: Unable to find a match: tree-but-spelled-wrong" $rlRun_LOG

elif is_fedora_39 "$image"; then
rlAssertGrep "err: Error: Unable to find a match: tree-but-spelled-wrong" $rlRun_LOG

elif is_ubuntu "$image" || is_debian "$image"; then
rlAssertGrep "err: E: Unable to locate package tree-but-spelled-wrong" $rlRun_LOG

Expand All @@ -293,7 +287,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_fedora_39 "$image" && ! is_ubi_8 "$image"; then
if ! is_centos_7 "$image" && ! is_ubi_8 "$image"; then
rlPhaseStartTest "$phase_prefix Just enable copr"
rlRun "$tmt execute plan --name copr"
rlPhaseEnd
Expand Down
4 changes: 2 additions & 2 deletions tests/provision/facts/test-guest.sh
Original file line number Diff line number Diff line change
Expand Up @@ -40,11 +40,11 @@ rlJournalStart
fi

elif [ "$PROVISION_HOW" = "container" ]; then
provision_options="--image fedora:39"
provision_options="--image localhost/tmt/container/test/fedora/41/upstream:latest"
bfu_provision_options="$provision_options --user=nobody"

arch="$(arch)"
distro="Fedora Linux 39 (Container Image)"
distro="Fedora Linux 41 (Container Image)"
kernel="$(uname -r)"
package_manager="dnf"

Expand Down
11 changes: 0 additions & 11 deletions tests/unit/test_package_managers.py
Original file line number Diff line number Diff line change
Expand Up @@ -44,8 +44,6 @@
url='containers-storage:localhost/tmt/container/test/fedora/41/upstream:latest')
CONTAINER_FEDORA_40 = Container(
url='containers-storage:localhost/tmt/container/test/fedora/40/upstream:latest')
CONTAINER_FEDORA_39 = Container(
url='containers-storage:localhost/tmt/container/test/fedora/39/upstream:latest')
CONTAINER_CENTOS_STREAM_10 = Container(
url='containers-storage:localhost/tmt/container/test/centos/stream10/upstream:latest')
CONTAINER_CENTOS_STREAM_9 = Container(
Expand Down Expand Up @@ -142,15 +140,6 @@ def assert_output(
(CONTAINER_FEDORA_40, PACKAGE_MANAGER_DNF),
(CONTAINER_FEDORA_40, PACKAGE_MANAGER_YUM),

# Supported in theory, but in practice, dnf5 is not going to
# officially be part of Fedora 39, and we are seeing some strange
# and broken behavior ruining our tests. On top of that, Fedora 39
# is going to be EOL very soon, therefore disabling this particular
# combination.
# (CONTAINER_FEDORA_39, PACKAGE_MANAGER_DNF5),
(CONTAINER_FEDORA_39, PACKAGE_MANAGER_DNF),
(CONTAINER_FEDORA_39, PACKAGE_MANAGER_YUM),

# CentOS Stream
(CONTAINER_CENTOS_STREAM_10, PACKAGE_MANAGER_DNF),
(CONTAINER_CENTOS_STREAM_9, PACKAGE_MANAGER_DNF),
Expand Down

0 comments on commit 4d471dd

Please sign in to comment.