From f6f4f947556eaa0b635135c964e141b4f78aaff2 Mon Sep 17 00:00:00 2001
From: Cristian Le <git@lecris.dev>
Date: Wed, 27 May 2026 15:47:51 +0200
Subject: [PATCH 1/5] Update container targets

Signed-off-by: Cristian Le <git@lecris.dev>
---
 Makefile                                      |  3 +++
 containers/fedora/44/Containerfile            | 18 +++++++++++++
 .../fedora/44/Containerfile.unprivileged      | 26 +++++++++++++++++++
 containers/fedora/44/Containerfile.upstream   | 17 ++++++++++++
 containers/fedora/{44 => 45}                  |  0
 containers/fedora/rawhide/Containerfile       |  4 ---
 tests/images.sh                               | 13 ++++++++++
 7 files changed, 77 insertions(+), 4 deletions(-)
 create mode 100644 containers/fedora/44/Containerfile
 create mode 100644 containers/fedora/44/Containerfile.unprivileged
 create mode 100644 containers/fedora/44/Containerfile.upstream
 rename containers/fedora/{44 => 45} (100%)

diff --git a/Makefile b/Makefile
index 6eef18a984..653eb2e522 100644
--- a/Makefile
+++ b/Makefile
@@ -218,6 +218,9 @@ TMT_TEST_CONTAINER_IMAGES := $(TMT_TEST_CONTAINER_IMAGE_NAME_PREFIX)/alpine:late
                              $(TMT_TEST_CONTAINER_IMAGE_NAME_PREFIX)/fedora/43:latest \
                              $(TMT_TEST_CONTAINER_IMAGE_NAME_PREFIX)/fedora/43/upstream:latest \
                              $(TMT_TEST_CONTAINER_IMAGE_NAME_PREFIX)/fedora/43/unprivileged:latest \
+                             $(TMT_TEST_CONTAINER_IMAGE_NAME_PREFIX)/fedora/44:latest \
+                             $(TMT_TEST_CONTAINER_IMAGE_NAME_PREFIX)/fedora/44/upstream:latest \
+                             $(TMT_TEST_CONTAINER_IMAGE_NAME_PREFIX)/fedora/44/unprivileged:latest \
                              $(TMT_TEST_CONTAINER_IMAGE_NAME_PREFIX)/ubi/8/upstream:latest \
                              $(TMT_TEST_CONTAINER_IMAGE_NAME_PREFIX)/ubi/9/upstream:latest \
                              $(TMT_TEST_CONTAINER_IMAGE_NAME_PREFIX)/ubuntu/22.04/upstream:latest \
diff --git a/containers/fedora/44/Containerfile b/containers/fedora/44/Containerfile
new file mode 100644
index 0000000000..b2e31b88b4
--- /dev/null
+++ b/containers/fedora/44/Containerfile
@@ -0,0 +1,18 @@
+#
+# A Fedora 44 image tailored for tmt test suite
+#
+# tmt/tests/fedora/44:latest
+#
+
+FROM quay.io/fedora/fedora:44
+
+# hadolint ignore=DL3040
+RUN <<EOF
+set -ex
+
+# Populate dnf cache
+dnf makecache
+
+# Make sure the image is built with the latest packages
+dnf update -y
+EOF
diff --git a/containers/fedora/44/Containerfile.unprivileged b/containers/fedora/44/Containerfile.unprivileged
new file mode 100644
index 0000000000..9dc7a86e0d
--- /dev/null
+++ b/containers/fedora/44/Containerfile.unprivileged
@@ -0,0 +1,26 @@
+#
+# A Fedora 44 image tailored for tmt test suite, with unprivileged account & password-less sudo
+#
+# tmt/tests/fedora/44/unprivileged:latest
+#
+
+FROM quay.io/fedora/fedora:44
+
+# hadolint ignore=DL3040
+RUN <<EOF
+set -ex
+
+# Populate dnf cache
+dnf makecache
+
+# Make sure the image is built with the latest packages
+dnf update -y
+
+# Create unprivileged user and setup sudo for it
+dnf install -y /usr/sbin/useradd
+useradd fedora
+usermod -aG wheel fedora
+printf "fedora\tALL=(ALL)\tNOPASSWD: ALL" >> /etc/sudoers
+EOF
+
+USER fedora
diff --git a/containers/fedora/44/Containerfile.upstream b/containers/fedora/44/Containerfile.upstream
new file mode 100644
index 0000000000..6058ce4cb6
--- /dev/null
+++ b/containers/fedora/44/Containerfile.upstream
@@ -0,0 +1,17 @@
+#
+# A Fedora 44 image tailored for tmt test suite
+#
+# tmt/tests/fedora/44/upstream:latest
+#
+
+FROM quay.io/fedora/fedora:44
+
+RUN <<EOF
+set -ex
+
+# Populate dnf cache
+dnf makecache
+
+# Make sure the image is built with the latest packages
+dnf update -y
+EOF
diff --git a/containers/fedora/44 b/containers/fedora/45
similarity index 100%
rename from containers/fedora/44
rename to containers/fedora/45
diff --git a/containers/fedora/rawhide/Containerfile b/containers/fedora/rawhide/Containerfile
index d8b26e2c2e..4a0caa20e2 100644
--- a/containers/fedora/rawhide/Containerfile
+++ b/containers/fedora/rawhide/Containerfile
@@ -15,8 +15,4 @@ dnf makecache
 
 # Make sure the image is built with the latest packages
 dnf update -y
-
-# Inject `dnf5` to make things more complicated for `dnf` family of
-# package manager implementations
-dnf install -y dnf5
 EOF
diff --git a/tests/images.sh b/tests/images.sh
index 4723540556..7a833d37b7 100644
--- a/tests/images.sh
+++ b/tests/images.sh
@@ -69,6 +69,8 @@ TEST_IMAGE_MODE_IMAGES="${TEST_IMAGE_MODE_IMAGES:-$(printf "%s\n" "${!IMAGE_MODE
 function is_fedora_rawhide () {
     [[ "$1" =~ ^.*fedora/rawhide[:/].* ]] && return 0
     [[ "$1" = "fedora-rawhide" ]] && return 0
+    [[ "$1" =~ ^.*fedora/45[:/].* ]] && return 0
+    [[ "$1" = "fedora-45" ]] && return 0
 
     return 1
 }
@@ -94,6 +96,17 @@ function is_fedora_43 () {
     return 1
 }
 
+function is_fedora_44 () {
+    [[ "$1" =~ ^.*fedora/44[:/].* ]] && return 0
+    [[ "$1" = "fedora-44" ]] && return 0
+
+    return 1
+}
+
+function is_fedora_45 () {
+    is_fedora_rawhide "$1"
+}
+
 function is_centos_stream_9 () {
     [[ "$1" =~ ^.*centos/stream9[:/].* ]] && return 0
     [[ "$1" = "centos-stream-9" ]] && return 0

From 6d71fa5d50a1de88d5698d34e8adce77fc9edcb2 Mon Sep 17 00:00:00 2001
From: Cristian Le <git@lecris.dev>
Date: Wed, 27 May 2026 15:51:42 +0200
Subject: [PATCH 2/5] Add f44 target

Signed-off-by: Cristian Le <git@lecris.dev>
---
 tests/images.sh                     | 2 ++
 tests/prepare/install/test.sh       | 4 ++++
 tests/unit/__init__.py              | 3 +++
 tests/unit/test_package_managers.py | 4 ++++
 4 files changed, 13 insertions(+)

diff --git a/tests/images.sh b/tests/images.sh
index 7a833d37b7..24b4eda2e1 100644
--- a/tests/images.sh
+++ b/tests/images.sh
@@ -24,6 +24,7 @@ $TEST_IMAGE_PREFIX/centos/stream9/upstream:latest
 $TEST_IMAGE_PREFIX/centos/stream10/upstream:latest
 $TEST_IMAGE_PREFIX/fedora/42/upstream:latest
 $TEST_IMAGE_PREFIX/fedora/43/upstream:latest
+$TEST_IMAGE_PREFIX/fedora/44/upstream:latest
 $TEST_IMAGE_PREFIX/fedora/rawhide/upstream:latest
 $TEST_IMAGE_PREFIX/fedora/eln/upstream:latest
 $TEST_IMAGE_PREFIX/ubi/8/upstream:latest
@@ -45,6 +46,7 @@ TEST_VIRTUAL_IMAGES="${TEST_VIRTUAL_IMAGES:-centos-stream-9
 centos-stream-10
 fedora-42
 fedora-43
+fedora-44
 fedora-rawhide
 fedora-coreos}"
 
diff --git a/tests/prepare/install/test.sh b/tests/prepare/install/test.sh
index fee5797e9d..854e219021 100755
--- a/tests/prepare/install/test.sh
+++ b/tests/prepare/install/test.sh
@@ -89,6 +89,10 @@ rlJournalStart
                 rlRun "distro=fedora-43"
                 rlRun "package_manager=dnf5"
 
+            elif is_fedora_44 "$image"; then
+                rlRun "distro=fedora-44"
+                rlRun "package_manager=dnf5"
+
             elif is_centos_stream_9 "$image"; then
                 rlRun "distro=centos-stream-9"
                 rlRun "package_manager=dnf"
diff --git a/tests/unit/__init__.py b/tests/unit/__init__.py
index ece8ab76e1..5eca556be0 100644
--- a/tests/unit/__init__.py
+++ b/tests/unit/__init__.py
@@ -194,6 +194,9 @@ def assert_not_log(
 CONTAINER_FEDORA_RAWHIDE = Container(
     url='containers-storage:localhost/tmt/container/test/fedora/rawhide/upstream:latest'
 )
+CONTAINER_FEDORA_44 = Container(
+    url='containers-storage:localhost/tmt/container/test/fedora/44/upstream:latest'
+)
 CONTAINER_FEDORA_43 = Container(
     url='containers-storage:localhost/tmt/container/test/fedora/43/upstream:latest'
 )
diff --git a/tests/unit/test_package_managers.py b/tests/unit/test_package_managers.py
index eb68781d0f..aa47bad236 100644
--- a/tests/unit/test_package_managers.py
+++ b/tests/unit/test_package_managers.py
@@ -49,6 +49,7 @@
     CONTAINER_DEBIAN_127,
     CONTAINER_FEDORA_42,
     CONTAINER_FEDORA_43,
+    CONTAINER_FEDORA_44,
     CONTAINER_FEDORA_ELN,
     # CONTAINER_FEDORA_COREOS,
     # CONTAINER_FEDORA_COREOS_OSTREE,
@@ -80,6 +81,7 @@ def has_legacy_dnf(container: ContainerData) -> bool:
 
     return container.image_url_or_id not in (
         CONTAINER_FEDORA_RAWHIDE.url,
+        CONTAINER_FEDORA_44.url,
         CONTAINER_FEDORA_43.url,
         CONTAINER_FEDORA_42.url,
         CONTAINER_FEDORA_ELN.url,
@@ -95,6 +97,7 @@ def has_dnf5_preinstalled(container: ContainerData) -> bool:
 
     return container.image_url_or_id in (
         CONTAINER_FEDORA_RAWHIDE.url,
+        CONTAINER_FEDORA_44.url,
         CONTAINER_FEDORA_43.url,
         CONTAINER_FEDORA_42.url,
         CONTAINER_FEDORA_ELN.url,
@@ -132,6 +135,7 @@ def assert_output(
     (CONTAINER_FEDORA_RAWHIDE, PACKAGE_MANAGER_DNF5),
     (CONTAINER_FEDORA_42, PACKAGE_MANAGER_DNF5),
     (CONTAINER_FEDORA_43, PACKAGE_MANAGER_DNF5),
+    (CONTAINER_FEDORA_44, PACKAGE_MANAGER_DNF5),
     (CONTAINER_FEDORA_ELN, PACKAGE_MANAGER_DNF5),
     # CentOS Stream
     (CONTAINER_CENTOS_STREAM_10, PACKAGE_MANAGER_DNF),

From 6ea9504cb9d8333e96cd09e0072e3a21a7bc395b Mon Sep 17 00:00:00 2001
From: Cristian Le <git@lecris.dev>
Date: Fri, 29 May 2026 14:59:22 +0200
Subject: [PATCH 3/5] Drop F42 targets

Signed-off-by: Cristian Le <git@lecris.dev>
---
 Makefile                                      | 16 ------------
 containers/fedora/42/Containerfile            | 22 ----------------
 .../fedora/42/Containerfile.unprivileged      | 26 -------------------
 containers/fedora/42/Containerfile.upstream   | 17 ------------
 tests/images.sh                               |  2 --
 tests/unit/__init__.py                        |  3 ---
 tests/unit/test_package_managers.py           |  4 ---
 7 files changed, 90 deletions(-)
 delete mode 100644 containers/fedora/42/Containerfile
 delete mode 100644 containers/fedora/42/Containerfile.unprivileged
 delete mode 100644 containers/fedora/42/Containerfile.upstream

diff --git a/Makefile b/Makefile
index 653eb2e522..7c86e8ff76 100644
--- a/Makefile
+++ b/Makefile
@@ -211,10 +211,6 @@ TMT_TEST_CONTAINER_IMAGES := $(TMT_TEST_CONTAINER_IMAGE_NAME_PREFIX)/alpine:late
                              $(TMT_TEST_CONTAINER_IMAGE_NAME_PREFIX)/fedora/rawhide:latest \
                              $(TMT_TEST_CONTAINER_IMAGE_NAME_PREFIX)/fedora/rawhide/upstream:latest \
                              $(TMT_TEST_CONTAINER_IMAGE_NAME_PREFIX)/fedora/rawhide/unprivileged:latest \
-                             $(TMT_TEST_CONTAINER_IMAGE_NAME_PREFIX)/fedora/42:latest \
-                             $(TMT_TEST_CONTAINER_IMAGE_NAME_PREFIX)/fedora/42/upstream:latest \
-                             $(TMT_TEST_CONTAINER_IMAGE_NAME_PREFIX)/fedora/42/unprivileged:latest \
-                             $(TMT_TEST_CONTAINER_IMAGE_NAME_PREFIX)/fedora/42/bootc:latest \
                              $(TMT_TEST_CONTAINER_IMAGE_NAME_PREFIX)/fedora/43:latest \
                              $(TMT_TEST_CONTAINER_IMAGE_NAME_PREFIX)/fedora/43/upstream:latest \
                              $(TMT_TEST_CONTAINER_IMAGE_NAME_PREFIX)/fedora/43/unprivileged:latest \
@@ -342,18 +338,6 @@ $(TMT_TEST_IMAGE_TARGET_PREFIX)/$(TMT_TEST_CONTAINER_IMAGE_NAME_PREFIX)/fedora/l
 $(TMT_TEST_IMAGE_TARGET_PREFIX)/$(TMT_TEST_CONTAINER_IMAGE_NAME_PREFIX)/fedora/latest/unprivileged\:latest:
 	$(call build-test-container-image,$@,fedora/latest/Containerfile.unprivileged)
 
-$(TMT_TEST_IMAGE_TARGET_PREFIX)/$(TMT_TEST_CONTAINER_IMAGE_NAME_PREFIX)/fedora/42\:latest:
-	$(call build-test-container-image,$@,fedora/42/Containerfile)
-
-$(TMT_TEST_IMAGE_TARGET_PREFIX)/$(TMT_TEST_CONTAINER_IMAGE_NAME_PREFIX)/fedora/42/upstream\:latest:
-	$(call build-test-container-image,$@,fedora/42/Containerfile.upstream)
-
-$(TMT_TEST_IMAGE_TARGET_PREFIX)/$(TMT_TEST_CONTAINER_IMAGE_NAME_PREFIX)/fedora/42/unprivileged\:latest:
-	$(call build-test-container-image,$@,fedora/42/Containerfile.unprivileged)
-
-$(TMT_TEST_IMAGE_TARGET_PREFIX)/$(TMT_TEST_CONTAINER_IMAGE_NAME_PREFIX)/fedora/42/bootc\:latest:
-	$(call build-test-container-image,$@,fedora/42/bootc/Containerfile)
-
 $(TMT_TEST_IMAGE_TARGET_PREFIX)/$(TMT_TEST_CONTAINER_IMAGE_NAME_PREFIX)/fedora/43\:latest:
 	$(call build-test-container-image,$@,fedora/43/Containerfile)
 
diff --git a/containers/fedora/42/Containerfile b/containers/fedora/42/Containerfile
deleted file mode 100644
index ce4b701380..0000000000
--- a/containers/fedora/42/Containerfile
+++ /dev/null
@@ -1,22 +0,0 @@
-#
-# A Fedora 42 image tailored for tmt test suite
-#
-# tmt/tests/fedora/42:latest
-#
-
-FROM quay.io/fedora/fedora:42
-
-# hadolint ignore=DL3040
-RUN <<EOF
-set -ex
-
-# Populate dnf cache
-dnf makecache
-
-# Make sure the image is built with the latest packages
-dnf update -y
-
-# Inject `dnf5` to make things more complicated for `dnf` family of
-# package manager implementations
-dnf install -y dnf5
-EOF
diff --git a/containers/fedora/42/Containerfile.unprivileged b/containers/fedora/42/Containerfile.unprivileged
deleted file mode 100644
index 8cb549063f..0000000000
--- a/containers/fedora/42/Containerfile.unprivileged
+++ /dev/null
@@ -1,26 +0,0 @@
-#
-# A Fedora 42 image tailored for tmt test suite, with unprivileged account & password-less sudo
-#
-# tmt/tests/fedora/42/unprivileged:latest
-#
-
-FROM quay.io/fedora/fedora:42
-
-# hadolint ignore=DL3040
-RUN <<EOF
-set -ex
-
-# Populate dnf cache
-dnf makecache
-
-# Make sure the image is built with the latest packages
-dnf update -y
-
-# Create unprivileged user and setup sudo for it
-dnf install -y /usr/sbin/useradd
-useradd fedora
-usermod -aG wheel fedora
-printf "fedora\tALL=(ALL)\tNOPASSWD: ALL" >> /etc/sudoers
-EOF
-
-USER fedora
diff --git a/containers/fedora/42/Containerfile.upstream b/containers/fedora/42/Containerfile.upstream
deleted file mode 100644
index 554cbfcece..0000000000
--- a/containers/fedora/42/Containerfile.upstream
+++ /dev/null
@@ -1,17 +0,0 @@
-#
-# A Fedora 42 image tailored for tmt test suite
-#
-# tmt/tests/fedora/42/upstream:latest
-#
-
-FROM quay.io/fedora/fedora:42
-
-RUN <<EOF
-set -ex
-
-# Populate dnf cache
-dnf makecache
-
-# Make sure the image is built with the latest packages
-dnf update -y
-EOF
diff --git a/tests/images.sh b/tests/images.sh
index 24b4eda2e1..df261d7bae 100644
--- a/tests/images.sh
+++ b/tests/images.sh
@@ -22,7 +22,6 @@ TEST_CONTAINER_IMAGES="${TEST_CONTAINER_IMAGES:-$TEST_IMAGE_PREFIX/alpine:latest
 $TEST_IMAGE_PREFIX/centos/7/upstream:latest
 $TEST_IMAGE_PREFIX/centos/stream9/upstream:latest
 $TEST_IMAGE_PREFIX/centos/stream10/upstream:latest
-$TEST_IMAGE_PREFIX/fedora/42/upstream:latest
 $TEST_IMAGE_PREFIX/fedora/43/upstream:latest
 $TEST_IMAGE_PREFIX/fedora/44/upstream:latest
 $TEST_IMAGE_PREFIX/fedora/rawhide/upstream:latest
@@ -44,7 +43,6 @@ TEST_CONTAINER_IMAGES_SECONDARY="${TEST_CONTAINER_IMAGES_SECONDARY:-$TEST_IMAGE_
 # TODO: enable centos-7 again with modified repo files
 TEST_VIRTUAL_IMAGES="${TEST_VIRTUAL_IMAGES:-centos-stream-9
 centos-stream-10
-fedora-42
 fedora-43
 fedora-44
 fedora-rawhide
diff --git a/tests/unit/__init__.py b/tests/unit/__init__.py
index 5eca556be0..6ffd19de70 100644
--- a/tests/unit/__init__.py
+++ b/tests/unit/__init__.py
@@ -200,9 +200,6 @@ def assert_not_log(
 CONTAINER_FEDORA_43 = Container(
     url='containers-storage:localhost/tmt/container/test/fedora/43/upstream:latest'
 )
-CONTAINER_FEDORA_42 = Container(
-    url='containers-storage:localhost/tmt/container/test/fedora/42/upstream:latest'
-)
 CONTAINER_FEDORA_ELN = Container(
     url='containers-storage:localhost/tmt/container/test/fedora/eln/upstream:latest'
 )
diff --git a/tests/unit/test_package_managers.py b/tests/unit/test_package_managers.py
index aa47bad236..0b9a6737f8 100644
--- a/tests/unit/test_package_managers.py
+++ b/tests/unit/test_package_managers.py
@@ -47,7 +47,6 @@
     CONTAINER_CENTOS_STREAM_9,
     CONTAINER_CENTOS_STREAM_10,
     CONTAINER_DEBIAN_127,
-    CONTAINER_FEDORA_42,
     CONTAINER_FEDORA_43,
     CONTAINER_FEDORA_44,
     CONTAINER_FEDORA_ELN,
@@ -83,7 +82,6 @@ def has_legacy_dnf(container: ContainerData) -> bool:
         CONTAINER_FEDORA_RAWHIDE.url,
         CONTAINER_FEDORA_44.url,
         CONTAINER_FEDORA_43.url,
-        CONTAINER_FEDORA_42.url,
         CONTAINER_FEDORA_ELN.url,
         # CONTAINER_FEDORA_COREOS.url,
         # CONTAINER_FEDORA_COREOS_OSTREE.url,
@@ -99,7 +97,6 @@ def has_dnf5_preinstalled(container: ContainerData) -> bool:
         CONTAINER_FEDORA_RAWHIDE.url,
         CONTAINER_FEDORA_44.url,
         CONTAINER_FEDORA_43.url,
-        CONTAINER_FEDORA_42.url,
         CONTAINER_FEDORA_ELN.url,
         # CONTAINER_FEDORA_COREOS.url,
         # CONTAINER_FEDORA_COREOS_OSTREE.url,
@@ -133,7 +130,6 @@ def assert_output(
 CONTAINER_BASE_MATRIX = [
     # Fedora
     (CONTAINER_FEDORA_RAWHIDE, PACKAGE_MANAGER_DNF5),
-    (CONTAINER_FEDORA_42, PACKAGE_MANAGER_DNF5),
     (CONTAINER_FEDORA_43, PACKAGE_MANAGER_DNF5),
     (CONTAINER_FEDORA_44, PACKAGE_MANAGER_DNF5),
     (CONTAINER_FEDORA_ELN, PACKAGE_MANAGER_DNF5),

From 95ae84e0c11e30907cd42a5408cdea8cb5d8d8aa Mon Sep 17 00:00:00 2001
From: Cristian Le <git@lecris.dev>
Date: Mon, 1 Jun 2026 10:13:24 +0200
Subject: [PATCH 4/5] Simplify package manager test branching

---
 tests/prepare/install/test.sh | 158 +++++++---------------------------
 1 file changed, 33 insertions(+), 125 deletions(-)

diff --git a/tests/prepare/install/test.sh b/tests/prepare/install/test.sh
index 854e219021..1f94c5368f 100755
--- a/tests/prepare/install/test.sh
+++ b/tests/prepare/install/test.sh
@@ -36,6 +36,36 @@ function fetch_downloaded_packages () {
     fi
 }
 
+function assert_package_manager () {
+    rlAssertGrep "package manager: $package_manager$" $rlRun_LOG
+
+    if is_centos_7 "$image"; then
+        rlAssertGrep "stdout: no package provides tree-but-spelled-wrong" $rlRun_LOG
+
+    elif is_centos "$image"; then
+        rlAssertGrep "stderr: Error: Unable to find a match: tree-but-spelled-wrong" $rlRun_LOG
+
+    elif is_ostree "$image"; then
+        if [ "$PROVISION_HOW" = "virtual" ]; then
+            rlAssertGrep "stderr: No match for argument: tree-but-spelled-wrong" $rlRun_LOG
+        else
+            rlAssertGrep "stderr: error: Packages not found: tree-but-spelled-wrong" $rlRun_LOG
+        fi
+
+    elif is_fedora "$image"; then
+        rlAssertGrep "stderr: No match for argument: tree-but-spelled-wrong" $rlRun_LOG
+
+    elif is_ubuntu "$image" || is_debian "$image"; then
+        rlAssertGrep "stderr: E: Unable to locate package tree-but-spelled-wrong" $rlRun_LOG
+
+    elif is_alpine "$image"; then
+        rlAssertGrep "stderr:   tree-but-spelled-wrong (no such package)" $rlRun_LOG
+
+    else
+        rlAssertGrep "stderr: Error: Unable to find a match: tree-but-spelled-wrong" $rlRun_LOG
+    fi
+}
+
 rlJournalStart
     rlPhaseStartSetup
         rlRun "PROVISION_HOW=${PROVISION_HOW:-container}"
@@ -292,143 +322,21 @@ rlJournalStart
 
         rlPhaseStartTest "$phase_prefix Install existing and invalid packages (plan)"
             rlRun -s "$tmt plan --name /missing" 2
-
-            rlAssertGrep "package manager: $package_manager$" $rlRun_LOG
-
-            if is_centos_7 "$image"; then
-                rlAssertGrep "stdout: no package provides tree-but-spelled-wrong" $rlRun_LOG
-
-            elif is_image_mode "$image"; then
-                if is_fedora "$image"; then
-                    rlAssertGrep "stderr: No match for argument: tree-but-spelled-wrong" $rlRun_LOG
-                else
-                    rlAssertGrep "stderr: Error: Unable to find a match: tree-but-spelled-wrong" $rlRun_LOG
-                fi
-
-            elif is_ostree "$image"; then
-                if [ "$PROVISION_HOW" = "virtual" ]; then
-                    rlAssertGrep "stderr: No match for argument: tree-but-spelled-wrong" $rlRun_LOG
-                else
-                    rlAssertGrep "stderr: error: Packages not found: tree-but-spelled-wrong" $rlRun_LOG
-                fi
-
-            elif is_fedora_coreos "$image"; then
-                rlAssertGrep "stderr: No match for argument: tree-but-spelled-wrong" $rlRun_LOG
-
-            elif is_fedora_rawhide "$image"; then
-                rlAssertGrep "stderr: No match for argument: tree-but-spelled-wrong" $rlRun_LOG
-
-            elif is_fedora_eln "$image"; then
-                rlAssertGrep "stderr: No match for argument: tree-but-spelled-wrong" $rlRun_LOG
-
-            elif is_fedora_43 "$image"; then
-                rlAssertGrep "stderr: No match for argument: tree-but-spelled-wrong" $rlRun_LOG
-
-            elif is_ubuntu "$image" || is_debian "$image"; then
-                rlAssertGrep "stderr: E: Unable to locate package tree-but-spelled-wrong" $rlRun_LOG
-
-            elif is_alpine "$image"; then
-                rlAssertGrep "stderr:   tree-but-spelled-wrong (no such package)" $rlRun_LOG
-
-            else
-                rlAssertGrep "stderr: Error: Unable to find a match: tree-but-spelled-wrong" $rlRun_LOG
-            fi
-
+            assert_package_manager
             rlAssertGrep "Other failed packages:" $rlRun_LOG
             rlAssertGrep "tree-but-spelled-wrong" $rlRun_LOG
         rlPhaseEnd
 
         rlPhaseStartTest "$phase_prefix Install existing and invalid packages (test)"
             rlRun -s "$tmt plan --name /missing-from-test" 2
-
-            rlAssertGrep "package manager: $package_manager$" $rlRun_LOG
-
-            if is_centos_7 "$image"; then
-                rlAssertGrep "stdout: no package provides tree-but-spelled-wrong" $rlRun_LOG
-
-            elif is_image_mode "$image"; then
-                if is_fedora "$image"; then
-                    rlAssertGrep "stderr: No match for argument: tree-but-spelled-wrong" $rlRun_LOG
-                else
-                    rlAssertGrep "stderr: Error: Unable to find a match: tree-but-spelled-wrong" $rlRun_LOG
-                fi
-
-            elif is_ostree "$image"; then
-                if [ "$PROVISION_HOW" = "virtual" ]; then
-                    rlAssertGrep "stderr: No match for argument: tree-but-spelled-wrong" $rlRun_LOG
-                else
-                    rlAssertGrep "stderr: error: Packages not found: tree-but-spelled-wrong" $rlRun_LOG
-                fi
-
-            elif is_fedora_coreos "$image"; then
-                rlAssertGrep "stderr: No match for argument: tree-but-spelled-wrong" $rlRun_LOG
-
-            elif is_fedora_rawhide "$image"; then
-                rlAssertGrep "stderr: No match for argument: tree-but-spelled-wrong" $rlRun_LOG
-
-            elif is_fedora_eln "$image"; then
-                rlAssertGrep "stderr: No match for argument: tree-but-spelled-wrong" $rlRun_LOG
-
-            elif is_fedora_43 "$image"; then
-                rlAssertGrep "stderr: No match for argument: tree-but-spelled-wrong" $rlRun_LOG
-
-            elif is_ubuntu "$image" || is_debian "$image"; then
-                rlAssertGrep "stderr: E: Unable to locate package tree-but-spelled-wrong" $rlRun_LOG
-
-            elif is_alpine "$image"; then
-                rlAssertGrep "stderr:   tree-but-spelled-wrong (no such package)" $rlRun_LOG
-
-            else
-                rlAssertGrep "stderr: Error: Unable to find a match: tree-but-spelled-wrong" $rlRun_LOG
-            fi
-
+            assert_package_manager
             rlAssertGrep "Required packages failed to install, aborting:" $rlRun_LOG
             rlAssertGrep "tree-but-spelled-wrong: required by: /test-with-invalid-package" $rlRun_LOG
         rlPhaseEnd
 
         rlPhaseStartTest "$phase_prefix Install existing and invalid packages (CLI)"
             rlRun -s "$tmt --insert --how install --package tree-but-spelled-wrong --package diffutils plan --name /empty" 2
-
-            rlAssertGrep "package manager: $package_manager$" $rlRun_LOG
-
-            if is_centos_7 "$image"; then
-                rlAssertGrep "stdout: no package provides tree-but-spelled-wrong" $rlRun_LOG
-
-            elif is_image_mode "$image"; then
-                if is_fedora "$image"; then
-                    rlAssertGrep "stderr: No match for argument: tree-but-spelled-wrong" $rlRun_LOG
-                else
-                    rlAssertGrep "stderr: Error: Unable to find a match: tree-but-spelled-wrong" $rlRun_LOG
-                fi
-
-            elif is_ostree "$image"; then
-                if [ "$PROVISION_HOW" = "virtual" ]; then
-                    rlAssertGrep "stderr: No match for argument: tree-but-spelled-wrong" $rlRun_LOG
-                else
-                    rlAssertGrep "stderr: error: Packages not found: tree-but-spelled-wrong" $rlRun_LOG
-                fi
-
-            elif is_fedora_coreos "$image"; then
-                rlAssertGrep "stderr: No match for argument: tree-but-spelled-wrong" $rlRun_LOG
-
-            elif is_fedora_rawhide "$image"; then
-                rlAssertGrep "stderr: No match for argument: tree-but-spelled-wrong" $rlRun_LOG
-
-            elif is_fedora_eln "$image"; then
-                rlAssertGrep "stderr: No match for argument: tree-but-spelled-wrong" $rlRun_LOG
-
-            elif is_fedora_43 "$image"; then
-                rlAssertGrep "stderr: No match for argument: tree-but-spelled-wrong" $rlRun_LOG
-
-            elif is_ubuntu "$image" || is_debian "$image"; then
-                rlAssertGrep "stderr: E: Unable to locate package tree-but-spelled-wrong" $rlRun_LOG
-
-            elif is_alpine "$image"; then
-                rlAssertGrep "stderr:   tree-but-spelled-wrong (no such package)" $rlRun_LOG
-
-            else
-                rlAssertGrep "stderr: Error: Unable to find a match: tree-but-spelled-wrong" $rlRun_LOG
-            fi
+            assert_package_manager
             rlAssertGrep "Other failed packages:" $rlRun_LOG
             rlAssertGrep "tree-but-spelled-wrong" $rlRun_LOG
         rlPhaseEnd

From 034a613ba14826df3d230dd0752702b92fa6e7f8 Mon Sep 17 00:00:00 2001
From: Cristian Le <git@lecris.dev>
Date: Wed, 3 Jun 2026 13:35:00 +0200
Subject: [PATCH 5/5] Bring back make target

Signed-off-by: Cristian Le <git@lecris.dev>
---
 Makefile | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/Makefile b/Makefile
index 7c86e8ff76..540e2b6838 100644
--- a/Makefile
+++ b/Makefile
@@ -211,6 +211,7 @@ TMT_TEST_CONTAINER_IMAGES := $(TMT_TEST_CONTAINER_IMAGE_NAME_PREFIX)/alpine:late
                              $(TMT_TEST_CONTAINER_IMAGE_NAME_PREFIX)/fedora/rawhide:latest \
                              $(TMT_TEST_CONTAINER_IMAGE_NAME_PREFIX)/fedora/rawhide/upstream:latest \
                              $(TMT_TEST_CONTAINER_IMAGE_NAME_PREFIX)/fedora/rawhide/unprivileged:latest \
+                             $(TMT_TEST_CONTAINER_IMAGE_NAME_PREFIX)/fedora/42/bootc:latest \
                              $(TMT_TEST_CONTAINER_IMAGE_NAME_PREFIX)/fedora/43:latest \
                              $(TMT_TEST_CONTAINER_IMAGE_NAME_PREFIX)/fedora/43/upstream:latest \
                              $(TMT_TEST_CONTAINER_IMAGE_NAME_PREFIX)/fedora/43/unprivileged:latest \
@@ -338,6 +339,9 @@ $(TMT_TEST_IMAGE_TARGET_PREFIX)/$(TMT_TEST_CONTAINER_IMAGE_NAME_PREFIX)/fedora/l
 $(TMT_TEST_IMAGE_TARGET_PREFIX)/$(TMT_TEST_CONTAINER_IMAGE_NAME_PREFIX)/fedora/latest/unprivileged\:latest:
 	$(call build-test-container-image,$@,fedora/latest/Containerfile.unprivileged)
 
+$(TMT_TEST_IMAGE_TARGET_PREFIX)/$(TMT_TEST_CONTAINER_IMAGE_NAME_PREFIX)/fedora/42/bootc\:latest:
+	$(call build-test-container-image,$@,fedora/42/bootc/Containerfile)
+
 $(TMT_TEST_IMAGE_TARGET_PREFIX)/$(TMT_TEST_CONTAINER_IMAGE_NAME_PREFIX)/fedora/43\:latest:
 	$(call build-test-container-image,$@,fedora/43/Containerfile)