.github/workflows/doc-tests.yml

@@ -0,0 +1,30 @@
+name: test-docs
+run-name: Documentation tests
+
+on:
+  pull_request:
+  push:
+    branches: [main]
+
+permissions:
+  contents: read
+
+jobs:
+  doc-test:
+    name: Sphinx-${{ matrix.builder }}
+    runs-on: ubuntu-latest
+    continue-on-error: ${{ matrix.experimental || false }}
+    strategy:
+      fail-fast: false
+      matrix:
+        builder: [ html ]
+        include:
+          # Run default html builder with warnings as error
+          - builder: html
+            args: -W
+    steps:
+      - uses: actions/checkout@v4
+      - name: Run sphinx builder ${{ matrix.builder }}
+        run: |
+          pip install hatch
+          hatch run docs:${{ matrix.builder }} ${{ matrix.args }}

.github/workflows/pre-commit.yml

@@ -3,12 +3,18 @@ name: pre-commit
 on:
   pull_request:
   push:
-    branches: [master]
+    branches: [main]
 
 jobs:
   pre-commit:
     runs-on: ubuntu-latest
+    env:
+      SKIP: no-commit-to-branch
     steps:
-    - uses: actions/checkout@v3
-    - uses: actions/setup-python@v4
+    - uses: actions/checkout@v4
+    - uses: actions/setup-python@v5
+      with:
+        python-version: |
+          3.9
+          3.x
     - uses: pre-commit/action@v3.0.0

.github/workflows/release.yml

@@ -28,7 +28,7 @@ jobs:
           ref: ${{ github.event.inputs.ref }}
 
       # Setup python
-      - uses: actions/setup-python@v4
+      - uses: actions/setup-python@v5
         with:
           python-version: "3.x"
 

.gitignore

@@ -46,6 +46,9 @@ tmt.1
 .mypy_cache
 .pytest_cache
 *.tgz
+# Created by pytest-html reporting plugin
+/assets/style.css
+/report.html
 
 # Virtual environment
 .env

.packit.yaml

@@ -46,7 +46,7 @@ jobs:
     tf_extra_params:
         test:
             tmt:
-                name: /plans/(features/core|features/basic|install/docs)
+                name: /plans/features/(core|basic)
 
   # Test pull requests (full)
   # Do not run extended unit tests, that plan gets its own job because

.pre-commit-config.yaml

@@ -24,6 +24,7 @@ repos:
     rev: "v1.9.0"
     hooks:
       - id: mypy
+        language_version: "3.9"
         # TODO: find out how to amend mypy, pyright, pre-commit and package requirements.
         # Apparently, there is no easy way to avoid some level of duplication of
         # information when the package is *not* installed, which is the case of tmt
@@ -68,6 +69,7 @@ repos:
     rev: v1.1.357
     hooks:
       - id: pyright
+        language_version: "3.9"
         # TODO: find out how to amend mypy, pyright, pre-commit and package requirements.
         # Apparently, there is no easy way to avoid some level of duplication of
         # information when the package is *not* installed, which is the case of tmt
@@ -153,3 +155,9 @@ repos:
         # Help installation by reducing the set of inspected botocore release.
         # There is *a lot* of them, and hatch might fetch many of them.
         - "botocore>=1.25.10"      # 1.25.10 is the current one available for RHEL9
+  - repo: https://github.com/codespell-project/codespell
+    rev: v2.2.6
+    hooks:
+      - id: codespell
+        additional_dependencies:
+          - tomli  # Required for python < 3.11

.readthedocs.yaml

@@ -1,12 +1,12 @@
 # Config for building https://tmt.readthedocs.io/
 version: 2
+python:
+  install:
+    - method: pip
+      path: .
+      extra_requirements:
+        - docs
 build:
-    os: ubuntu-22.04
-    tools:
-        python: "3"
-    # Override RTD's default build commands, install hatch & delegate
-    # the rest to our Makefiles.
-    commands:
-      - cat docs/conf.py
-      - pip install hatch
-      - make BUILDDIR=$READTHEDOCS_OUTPUT docs
+  os: ubuntu-22.04
+  tools:
+    python: "3"

Makefile

@@ -6,7 +6,10 @@
 
 # Prepare variables
 TMP = $(CURDIR)/tmp
-UNIT_TESTS_IMAGE_TAG = tmt-unit-tests
+
+ccred=$(shell tput setaf 1)
+ccgreen=$(shell tput setaf 2)
+ccend=$(shell tput sgr0)
 
 # Define special targets
 .DEFAULT_GOAL := help
@@ -83,19 +86,98 @@ images:  ## Build tmt images for podman/docker
 	podman build -t tmt --squash -f ./containers/Containerfile.mini .
 	podman build -t tmt-all --squash -f ./containers/Containerfile.full .
 
-images-unit-tests: image-unit-tests-alpine image-unit-tests-coreos  ## Build images for unit tests
+TMT_TEST_IMAGE_TARGET_PREFIX = images-tests
+TMT_TEST_CONTAINER_IMAGE_NAME_PREFIX = tmt/tests/container
+
+TMT_TEST_CONTAINER_IMAGES := $(TMT_TEST_CONTAINER_IMAGE_NAME_PREFIX)/alpine:latest \
+                             $(TMT_TEST_CONTAINER_IMAGE_NAME_PREFIX)/alpine/upstream:latest \
+                             $(TMT_TEST_CONTAINER_IMAGE_NAME_PREFIX)/centos/7/upstream:latest \
+                             $(TMT_TEST_CONTAINER_IMAGE_NAME_PREFIX)/centos/stream9/upstream:latest \
+                             $(TMT_TEST_CONTAINER_IMAGE_NAME_PREFIX)/fedora/coreos:stable \
+                             $(TMT_TEST_CONTAINER_IMAGE_NAME_PREFIX)/fedora/coreos/ostree:stable \
+                             $(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/40:latest \
+                             $(TMT_TEST_CONTAINER_IMAGE_NAME_PREFIX)/fedora/40/upstream:latest \
+                             $(TMT_TEST_CONTAINER_IMAGE_NAME_PREFIX)/fedora/40/unprivileged:latest \
+                             $(TMT_TEST_CONTAINER_IMAGE_NAME_PREFIX)/fedora/39:latest \
+                             $(TMT_TEST_CONTAINER_IMAGE_NAME_PREFIX)/fedora/39/upstream:latest \
+                             $(TMT_TEST_CONTAINER_IMAGE_NAME_PREFIX)/fedora/39/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_IMAGES_TARGETS := $(foreach image,$(TMT_TEST_CONTAINER_IMAGES),images-tests/$(subst :,\:,$(image)))
+
+images-tests: $(TMT_TEST_IMAGES_TARGETS)  ## Build customized images for tests
+	podman images | grep 'localhost/$(TMT_TEST_CONTAINER_IMAGE_NAME_PREFIX)/' | sort
+
+define test-container-image-target-to-name =
+$(subst $(TMT_TEST_IMAGE_TARGET_PREFIX)/,,${1})
+endef
+
+define build-test-container-image =
+@ echo "$(ccgreen)Building $(ccred)$(call test-container-image-target-to-name,$@)$(ccend) $(ccgreen)image...$(ccend)"
+podman build -t $(call test-container-image-target-to-name,${1}) -f ./containers/${2} .
+@ echo
+endef
+
+$(TMT_TEST_IMAGE_TARGET_PREFIX)/$(TMT_TEST_CONTAINER_IMAGE_NAME_PREFIX)/alpine\:latest:
+	$(call build-test-container-image,$@,alpine/Containerfile)
+
+$(TMT_TEST_IMAGE_TARGET_PREFIX)/$(TMT_TEST_CONTAINER_IMAGE_NAME_PREFIX)/alpine/upstream\:latest:
+	$(call build-test-container-image,$@,alpine/Containerfile.upstream)
+
+$(TMT_TEST_IMAGE_TARGET_PREFIX)/$(TMT_TEST_CONTAINER_IMAGE_NAME_PREFIX)/centos/7/upstream\:latest:
+	$(call build-test-container-image,$@,centos/7/Containerfile.upstream)
+
+$(TMT_TEST_IMAGE_TARGET_PREFIX)/$(TMT_TEST_CONTAINER_IMAGE_NAME_PREFIX)/centos/stream9/upstream\:latest:
+	$(call build-test-container-image,$@,centos/stream9/Containerfile.upstream)
+
+$(TMT_TEST_IMAGE_TARGET_PREFIX)/$(TMT_TEST_CONTAINER_IMAGE_NAME_PREFIX)/fedora/coreos\:stable:
+	$(call build-test-container-image,$@,fedora/coreos/Containerfile)
 
-image-unit-tests-alpine:  ## Build local alpine image for unit tests
-	podman build -t alpine:$(UNIT_TESTS_IMAGE_TAG) -f ./containers/Containerfile.alpine .
+$(TMT_TEST_IMAGE_TARGET_PREFIX)/$(TMT_TEST_CONTAINER_IMAGE_NAME_PREFIX)/fedora/coreos/ostree\:stable:
+	$(call build-test-container-image,$@,fedora/coreos/ostree/Containerfile)
 
-image-unit-tests-coreos:  ## Build local CoreOS image for unit tests
-	podman build -t fedora-coreos:$(UNIT_TESTS_IMAGE_TAG) -f ./containers/Containerfile.coreos .
+$(TMT_TEST_IMAGE_TARGET_PREFIX)/$(TMT_TEST_CONTAINER_IMAGE_NAME_PREFIX)/fedora/rawhide\:latest:
+	$(call build-test-container-image,$@,fedora/rawhide/Containerfile)
+
+$(TMT_TEST_IMAGE_TARGET_PREFIX)/$(TMT_TEST_CONTAINER_IMAGE_NAME_PREFIX)/fedora/rawhide/upstream\:latest:
+	$(call build-test-container-image,$@,fedora/rawhide/Containerfile.upstream)
+
+$(TMT_TEST_IMAGE_TARGET_PREFIX)/$(TMT_TEST_CONTAINER_IMAGE_NAME_PREFIX)/fedora/rawhide/unprivileged\:latest:
+	$(call build-test-container-image,$@,fedora/rawhide/Containerfile.unprivileged)
+
+$(TMT_TEST_IMAGE_TARGET_PREFIX)/$(TMT_TEST_CONTAINER_IMAGE_NAME_PREFIX)/fedora/40\:latest:
+	$(call build-test-container-image,$@,fedora/40/Containerfile)
+
+$(TMT_TEST_IMAGE_TARGET_PREFIX)/$(TMT_TEST_CONTAINER_IMAGE_NAME_PREFIX)/fedora/40/upstream\:latest:
+	$(call build-test-container-image,$@,fedora/40/Containerfile.upstream)
+
+$(TMT_TEST_IMAGE_TARGET_PREFIX)/$(TMT_TEST_CONTAINER_IMAGE_NAME_PREFIX)/fedora/40/unprivileged\:latest:
+	$(call build-test-container-image,$@,fedora/40/Containerfile.unprivileged)
+
+$(TMT_TEST_IMAGE_TARGET_PREFIX)/$(TMT_TEST_CONTAINER_IMAGE_NAME_PREFIX)/fedora/39\:latest:
+	$(call build-test-container-image,$@,fedora/39/Containerfile)
+
+$(TMT_TEST_IMAGE_TARGET_PREFIX)/$(TMT_TEST_CONTAINER_IMAGE_NAME_PREFIX)/fedora/39/upstream\:latest:
+	$(call build-test-container-image,$@,fedora/39/Containerfile.upstream)
+
+$(TMT_TEST_IMAGE_TARGET_PREFIX)/$(TMT_TEST_CONTAINER_IMAGE_NAME_PREFIX)/fedora/39/unprivileged\:latest:
+	$(call build-test-container-image,$@,fedora/39/Containerfile.unprivileged)
+
+$(TMT_TEST_IMAGE_TARGET_PREFIX)/$(TMT_TEST_CONTAINER_IMAGE_NAME_PREFIX)/ubi/8/upstream\:latest:
+	$(call build-test-container-image,$@,ubi/8/Containerfile.upstream)
+
+$(TMT_TEST_IMAGE_TARGET_PREFIX)/$(TMT_TEST_CONTAINER_IMAGE_NAME_PREFIX)/ubuntu/22.04/upstream\:latest:
+	$(call build-test-container-image,$@,ubuntu/22.04/Containerfile.upstream)
 
 ##
 ## Development
 ##
 develop: _deps  ## Install development requirements
-	sudo dnf install -y gcc git python3-nitrate {libvirt,krb5,libpq,python3}-devel jq podman buildah
+	sudo dnf install -y gcc git python3-nitrate {libvirt,krb5,libpq,python3}-devel jq podman buildah /usr/bin/python3.9
 
 # Git vim tags and cleanup
 tags:
@@ -113,11 +195,16 @@ clean:  ## Remove all temporary files, packaging artifacts and docs
 	rm -rf examples/convert/{main.fmf,test.md,Manual} Manual
 	rm -f tests/full/repo_copy.tgz
 
+clean-test-images:  ## Remove all custom images built for tests
+	for image in $(TMT_TEST_CONTAINER_IMAGES); do \
+	    podman rmi -i "$$image"; \
+	done
+
 ##
 ## Help!
 ##
 help:: ## Show this help text
-	@gawk -vG=$$(tput setaf 2) -vR=$$(tput sgr0) ' \
+	@gawk -vG="$(ccgreen)" -vR="$(ccend)" ' \
 	  match($$0, "^(([^#:]*[^ :]) *:)?([^#]*)##([^#].+|)$$",a) { \
 	    if (a[2] != "") { printf "    make %s%-18s%s %s\n", G, a[2], R, a[4]; next }\
 	    if (a[3] == "") { print a[4]; next }\

containers/alpine/Containerfile

@@ -0,0 +1,12 @@
+#
+# An Alpine image tailored for tmt test suite
+#
+# tmt/tests/alpine:latest
+#
+
+FROM docker.io/library/alpine:3.19
+
+    # Populate apk cache
+RUN    apk update \
+    # Inject `bash` which is unavoidably required by tmt
+    && apk add --no-cache bash

containers/alpine/Containerfile.upstream

@@ -0,0 +1,10 @@
+#
+# An Alpine image tailored for tmt test suite
+#
+# tmt/tests/alpine/upstream:latest
+#
+
+FROM docker.io/library/alpine:3.19
+
+    # Populate apk cache
+RUN apk update

containers/centos/7/Containerfile.upstream

@@ -0,0 +1,10 @@
+#
+# A CentOS 7 image tailored for tmt test suite
+#
+# tmt/tests/centos/7/upstream:latest
+#
+
+FROM quay.io/centos/centos:7
+
+    # Populate yum cache
+RUN yum makecache

containers/centos/stream9/Containerfile.upstream

@@ -0,0 +1,10 @@
+#
+# A CentOS Stream 9 image tailored for tmt test suite
+#
+# tmt/tests/centos/stream9/upstream:latest
+#
+
+FROM quay.io/centos/centos:stream9
+
+    # Populate dnf cache
+RUN dnf makecache

containers/fedora/39/Containerfile

@@ -0,0 +1,13 @@
+#
+# A Fedora 39 image tailored for tmt test suite
+#
+# tmt/tests/fedora/39:latest
+#
+
+FROM quay.io/fedora/fedora:39
+
+    # Populate dnf cache
+RUN    dnf makecache \
+    # Inject `dnf5` to make things more complicated for `dnf` family of
+    # package manager implementations
+    && dnf install -y dnf5

containers/fedora/39/Containerfile.unprivileged

@@ -0,0 +1,17 @@
+#
+# A Fedora 39 image tailored for tmt test suite, with unprivileged account & password-less sudo
+#
+# tmt/tests/fedora/39/unprivileged:latest
+#
+
+FROM quay.io/fedora/fedora:39
+
+    # Populate dnf cache
+RUN    dnf makecache \
+    # Create unprivileged user and setup sudo for it
+    && dnf install -y /usr/sbin/useradd \
+    && useradd fedora \
+    && usermod -aG wheel fedora \
+    && echo -e 'fedora\tALL=(ALL)\tNOPASSWD: ALL' >> /etc/sudoers
+
+USER fedora

containers/fedora/39/Containerfile.upstream

@@ -0,0 +1,10 @@
+#
+# A Fedora 39 image tailored for tmt test suite
+#
+# tmt/tests/fedora/39/upstream:latest
+#
+
+FROM quay.io/fedora/fedora:39
+
+    # Populate dnf cache
+RUN dnf makecache

containers/fedora/40/Containerfile

@@ -0,0 +1,13 @@
+#
+# A Fedora 40 image tailored for tmt test suite
+#
+# tmt/tests/fedora/40:latest
+#
+
+FROM quay.io/fedora/fedora:40
+
+    # Populate dnf cache
+RUN    dnf makecache \
+    # Inject `dnf5` to make things more complicated for `dnf` family of
+    # package manager implementations
+    && dnf install -y dnf5

containers/fedora/40/Containerfile.unprivileged

@@ -0,0 +1,17 @@
+#
+# A Fedora 40 image tailored for tmt test suite, with unprivileged account & password-less sudo
+#
+# tmt/tests/fedora/40/unprivileged:latest
+#
+
+FROM quay.io/fedora/fedora:40
+
+    # Populate dnf cache
+RUN    dnf makecache \
+    # Create unprivileged user and setup sudo for it
+    && dnf install -y /usr/sbin/useradd \
+    && useradd fedora \
+    && usermod -aG wheel fedora \
+    && echo -e 'fedora\tALL=(ALL)\tNOPASSWD: ALL' >> /etc/sudoers
+
+USER fedora