Skip to content

Move f44 reference for container #4775

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

Open
LecrisUT wants to merge 3 commits into
base: main
Choose a base branch
from
Open

Move f44 reference for container #4775

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
74ae47e
Move f44 reference for container
LecrisUT Apr 2, 2026
f0f8a5b
Adjust tests branching
LecrisUT Apr 2, 2026
d8f0dfb
Merge branch 'main' into chore/bump-container
LecrisUT Apr 8, 2026
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
15 changes: 15 additions & 0 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -136,6 +136,12 @@ 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)/fedora/45:latest \
$(TMT_TEST_CONTAINER_IMAGE_NAME_PREFIX)/fedora/45/upstream:latest \
$(TMT_TEST_CONTAINER_IMAGE_NAME_PREFIX)/fedora/45/unprivileged:latest \
$(TMT_TEST_CONTAINER_IMAGE_NAME_PREFIX)/ubi/8/upstream:latest \
$(TMT_TEST_CONTAINER_IMAGE_NAME_PREFIX)/ubuntu/22.04/upstream:latest \
$(TMT_TEST_CONTAINER_IMAGE_NAME_PREFIX)/debian/12.7/upstream:latest \
Expand Down Expand Up @@ -286,6 +292,15 @@ $(TMT_TEST_IMAGE_TARGET_PREFIX)/$(TMT_TEST_CONTAINER_IMAGE_NAME_PREFIX)/fedora/4
$(TMT_TEST_IMAGE_TARGET_PREFIX)/$(TMT_TEST_CONTAINER_IMAGE_NAME_PREFIX)/fedora/44/unprivileged\:latest:
$(call build-test-container-image,$@,fedora/44/Containerfile.unprivileged)

$(TMT_TEST_IMAGE_TARGET_PREFIX)/$(TMT_TEST_CONTAINER_IMAGE_NAME_PREFIX)/fedora/45\:latest:
$(call build-test-container-image,$@,fedora/45/Containerfile)

$(TMT_TEST_IMAGE_TARGET_PREFIX)/$(TMT_TEST_CONTAINER_IMAGE_NAME_PREFIX)/fedora/45/upstream\:latest:
$(call build-test-container-image,$@,fedora/45/Containerfile.upstream)

$(TMT_TEST_IMAGE_TARGET_PREFIX)/$(TMT_TEST_CONTAINER_IMAGE_NAME_PREFIX)/fedora/45/unprivileged\:latest:
$(call build-test-container-image,$@,fedora/45/Containerfile.unprivileged)
Comment thread
LecrisUT marked this conversation as resolved.

$(TMT_TEST_IMAGE_TARGET_PREFIX)/$(TMT_TEST_CONTAINER_IMAGE_NAME_PREFIX)/ubi/8/upstream\:latest:
$(call build-test-container-image,$@,ubi/8/Containerfile.upstream)

Expand Down
22 changes: 22 additions & 0 deletions containers/fedora/44/Containerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
#
# 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

# Inject `dnf5` to make things more complicated for `dnf` family of
# package manager implementations
dnf install -y dnf5
EOF
26 changes: 26 additions & 0 deletions containers/fedora/44/Containerfile.unprivileged
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Comment thread
LecrisUT marked this conversation as resolved.
EOF

USER fedora
17 changes: 17 additions & 0 deletions containers/fedora/44/Containerfile.upstream
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
0 containers/fedora/44 → containers/fedora/45
View file
Open in desktop
File renamed without changes.
12 changes: 6 additions & 6 deletions docs/ext/tmt_setup.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,11 +16,11 @@ def setup(app: "Sphinx") -> None:
# This is a meta extension that gathers all of the individual extensions
# in the ext folder.
app.setup_extension("linkcheck_cache")
app.setup_extension("sphinx_apidoc")
app.setup_extension("generate_lint_checks")
app.setup_extension("generate_hardware_matrix")
app.setup_extension("generate_test_runner_guest_matrix")
app.setup_extension("generate_template_extensions")
app.setup_extension("generate_plugins")
# app.setup_extension("sphinx_apidoc")
# app.setup_extension("generate_lint_checks")
# app.setup_extension("generate_hardware_matrix")
# app.setup_extension("generate_test_runner_guest_matrix")
# app.setup_extension("generate_template_extensions")
# app.setup_extension("generate_plugins")
app.setup_extension("generate_release_notes")
app.setup_extension("tmt_domain")
11 changes: 11 additions & 0 deletions tests/images.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,8 @@ $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/45/upstream:latest
$TEST_IMAGE_PREFIX/fedora/rawhide/upstream:latest
$TEST_IMAGE_PREFIX/fedora/eln/upstream:latest
$TEST_IMAGE_PREFIX/ubi/8/upstream:latest
Expand All @@ -44,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}"

Expand All @@ -55,6 +58,7 @@ TEST_VIRTUAL_IMAGES_SECONDARY="${TEST_VIRTUAL_IMAGES_SECONDARY:-fedora-42}"
function is_fedora_rawhide () {
[[ "$1" =~ ^.*fedora/rawhide[:/].* ]] && return 0
[[ "$1" = "fedora-rawhide" ]] && return 0
[[ "$1" =~ ^.*fedora/45[:/].* ]] && return 0

return 1
}
Expand All @@ -80,6 +84,13 @@ function is_fedora_43 () {
return 1
}

function is_fedora_44 () {
[[ "$1" =~ ^.*fedora/44[:/].* ]] && return 0
[[ "$1" = "fedora-44" ]] && return 0

return 1
}

function is_centos_stream_9 () {
[[ "$1" =~ ^.*centos/stream9[:/].* ]] && return 0
[[ "$1" = "centos-stream-9" ]] && return 0
Expand Down
37 changes: 7 additions & 30 deletions tests/prepare/install/test.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,6 +78,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"
Expand Down Expand Up @@ -251,16 +255,7 @@ rlJournalStart
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
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
Expand Down Expand Up @@ -292,16 +287,7 @@ rlJournalStart
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
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
Expand Down Expand Up @@ -333,16 +319,7 @@ rlJournalStart
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
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
Expand Down
Loading