TMT: Run integration and unit tests

Include system and integration tests in the same file, get rid of tags
and filter by plan name. Adjust names and identifiers for consistency.

Signed-off-by: Lokesh Mandvekar <[email protected]>

Author: lsm5

.packit.yaml

@@ -48,3 +48,39 @@ jobs:
     targets: *test_targets
     tmt_plan: "/plans/system/rootless-remote"
     identifier: "sys-remote-rootless"
+
+  - job: tests
+    trigger: pull_request
+    skip_build: true
+    use_internal_tf: true
+    notifications: *packit_failure_notification
+    targets: *test_targets
+    tmt_plan: "/plans/integration/rootless-local"
+    identifier: "int-local-rootless"
+
+  - job: tests
+    trigger: pull_request
+    skip_build: true
+    use_internal_tf: true
+    notifications: *packit_failure_notification
+    targets: *test_targets
+    tmt_plan: "/plans/integration/root-remote"
+    identifier: "int-remote-root"
+
+  - job: tests
+    trigger: pull_request
+    skip_build: true
+    use_internal_tf: true
+    notifications: *packit_failure_notification
+    targets: *test_targets
+    tmt_plan: "/plans/integration/rootless-remote"
+    identifier: "int-remote-rootless"
+
+  - job: tests
+    trigger: pull_request
+    skip_build: true
+    use_internal_tf: true
+    notifications: *packit_failure_notification
+    targets: *test_targets
+    tmt_plan: "/plans/localunit"
+    identifier: "unit"

Makefile

@@ -647,7 +647,7 @@ run-docker-py-tests:
 	rm -f test/__init__.py
 
 .PHONY: localunit
-localunit: test/goecho/goecho test/version/version
+localunit: .install.ginkgo test/goecho/goecho test/version/version
 	rm -rf ${COVERAGE_PATH} && mkdir -p ${COVERAGE_PATH}
 	UNIT=1 $(GINKGO) \
 		-r \

pkg/machine/qemu/command/qemu_command_test.go

@@ -7,11 +7,17 @@ import (
 	"testing"
 
 	"github.com/containers/podman/v5/pkg/machine/define"
+	. "github.com/containers/podman/v5/test/utils"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 )
 
 func TestQemuCmd(t *testing.T) {
+	host := GetHostDistributionInfo()
+	if host.Distribution == "rhel" || host.Distribution == "centos" && host.Distribution != "fedora" {
+		t.Skip("Skip QEMU tests on RHEL and CentOS Stream")
+	}
+
 	ignFile, err := define.NewMachineFile(t.TempDir()+"demo-ignition-file.ign", nil)
 	assert.NoError(t, err)
 

plans/integration.fmf

@@ -0,0 +1,55 @@
+discover:
+    how: fmf
+
+execute:
+    how: tmt
+
+prepare:
+    - name: build and test dependencies
+      how: install
+      package:
+        - aardvark-dns
+        - go-md2man
+        - golang
+        - gpgme-devel
+        - libseccomp-devel
+        - netavark
+        - podman-catatonit
+        # podman-tests used only to fetch test dependencies
+        - podman-tests
+        - slirp4netns
+        - systemd-devel
+      order: 5
+    - how: shell
+      script: modprobe null_blk nr_devices=1
+      order: 5
+
+provision:
+    how: artemis
+    hardware:
+        memory: ">= 16 GB"
+        cpu:
+            cores: ">= 4"
+            threads: ">=8"
+        disk:
+            - size: ">= 512 GB"
+
+/root-local:
+    summary: Local rootful integration tests
+    discover+:
+        test: /test/tmt/int-root-local
+
+/rootless-local:
+    summary: Local rootless integration tests
+    discover+:
+        test: /test/tmt/int-rootless-local
+
+/root-remote:
+    summary: Remote rootful integration tests
+    discover+:
+        test: /test/tmt/int-root-remote
+
+/rootless-remote:
+    summary: Remote rootless integration tests
+    discover+:
+        test: /test/tmt/int-rootless-remote

plans/localunit.fmf

@@ -0,0 +1,28 @@
+summary: Run unit tests
+
+discover:
+    how: fmf
+    test: /test/tmt/localunit
+
+execute:
+    how: tmt
+
+prepare:
+    - name: build and test dependencies
+      how: install
+      package:
+        - golang
+        - gpgme-devel
+        - libseccomp-devel
+        - systemd-devel
+      order: 5
+
+provision:
+    how: artemis
+    hardware:
+        memory: ">= 16 GB"
+        cpu:
+            cores: ">= 4"
+            threads: ">=8"
+        disk:
+            - size: ">= 512 GB"

plans/system.fmf

@@ -53,7 +53,7 @@ provision:
             - size: ">= 512 GB"
 
 /root-local:
-    summary: Local root system tests
+    summary: Local rootful system tests
     discover+:
         test: /test/tmt/sys-root-local
 
@@ -63,7 +63,7 @@ provision:
         test: /test/tmt/sys-rootless-local
 
 /root-remote:
-    summary: Remote root system tests
+    summary: Remote rootful system tests
     discover+:
         test: /test/tmt/sys-root-remote
 

test/tmt/main.fmf

@@ -35,3 +35,35 @@ adjust+:
         chown -R $ROOTLESS_USER $TMT_TREE &&
         su - "$ROOTLESS_USER" -c "CI_DESIRED_NETWORK=netavark make -C $TMT_TREE remotesystem"
     duration: 40m
+
+/int-root-local:
+    test: >
+        bash ./setup.sh &&
+        make -C $TMT_TREE localintegration
+    duration: 40m
+
+/int-rootless-local:
+    test: >
+        bash ./setup.sh &&
+        loginctl enable-linger $ROOTLESS_USER &&
+        chown -R $ROOTLESS_USER $TMT_TREE &&
+        su - "$ROOTLESS_USER" -c "make -C $TMT_TREE localintegration"
+    duration: 40m
+
+/int-root-remote:
+    test: >
+        bash ./setup.sh &&
+        make -C $TMT_TREE remoteintegration
+    duration: 40m
+
+/int-rootless-remote:
+    test: >
+        bash ./setup.sh &&
+        loginctl enable-linger $ROOTLESS_USER &&
+        chown -R $ROOTLESS_USER $TMT_TREE &&
+        su - "$ROOTLESS_USER" -c "make -C $TMT_TREE remoteintegration"
+    duration: 40m
+
+/localunit:
+    test: make -C $TMT_TREE localunit
+    duration: 40m