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

@@ -19,7 +19,7 @@ jobs:
         distros: [RHEL-9.6.0-Nightly]
       epel-9-aarch64:
         distros: [RHEL-9.6.0-Nightly]
-    tmt_plan: "/plans/system/root-local"
+    tmt_plan: "/plans/sys-root-local"
     identifier: "sys-local-root"
 
   - job: tests
@@ -28,7 +28,7 @@ jobs:
     use_internal_tf: true
     notifications: *packit_failure_notification
     targets: *test_targets
-    tmt_plan: "/plans/system/rootless-local"
+    tmt_plan: "/plans/sys-rootless-local"
     identifier: "sys-local-rootless"
 
   - job: tests
@@ -37,7 +37,7 @@ jobs:
     use_internal_tf: true
     notifications: *packit_failure_notification
     targets: *test_targets
-    tmt_plan: "/plans/system/root-remote"
+    tmt_plan: "/plans/sys-root-remote"
     identifier: "sys-remote-root"
 
   - job: tests
@@ -46,5 +46,41 @@ jobs:
     use_internal_tf: true
     notifications: *packit_failure_notification
     targets: *test_targets
-    tmt_plan: "/plans/system/rootless-remote"
+    tmt_plan: "/plans/sys-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/int-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/int-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/int-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"

plans/system.fmf renamed to plans/main.fmf

@@ -52,22 +52,47 @@ provision:
         disk:
             - size: ">= 512 GB"
 
-/root-local:
-    summary: Local root system tests
+/sys-root-local:
+    summary: Local rootful system tests
     discover+:
-        filter: 'tag:local & tag:root & tag:system'
+        test: /test/tmt/sys-root-local
 
-/rootless-local:
+/sys-rootless-local:
     summary: Local rootless system tests
     discover+:
-        filter: 'tag:local & tag:rootless & tag:system'
+        test: /test/tmt/sys-rootless-local
 
-/root-remote:
-    summary: Remote root system tests
+/sys-root-remote:
+    summary: Remote rootful system tests
     discover+:
-        filter: 'tag:remote & tag:root & tag:system'
+        test: /test/tmt/sys-root-remote
 
-/rootless-remote:
+/sys-rootless-remote:
     summary: Remote rootless system tests
     discover+:
-        filter: 'tag:remote & tag:rootless & tag:system'
+        test: /test/tmt/sys-rootless-remote
+
+/int-root-local:
+    summary: Local rootful integration tests
+    discover+:
+        test: /test/tmt/int-root-local
+
+/int-rootless-local:
+    summary: Local rootless integration tests
+    discover+:
+        test: /test/tmt/int-rootless-local
+
+/int-root-remote:
+    summary: Remote rootful integration tests
+    discover+:
+        test: /test/tmt/int-root-remote
+
+/int-rootless-remote:
+    summary: Remote rootless integration tests
+    discover+:
+        test: /test/tmt/int-rootless-remote
+
+/localunit:
+    summary: Run unit tests
+    discover+:
+        test: /test/tmt/localunit

test/tmt/system.fmf renamed to test/tmt/main.fmf

@@ -8,38 +8,62 @@ adjust+:
       environment+:
         ROOTLESS_USER: "cloud-user"
 
-/local-root:
-    tag: [ local, root, system ]
-    summary: local rootful test
+/sys-root-local:
     test: >
         bash ./setup.sh &&
         make -C $TMT_TREE localsystem
     duration: 40m
 
-/local-rootless:
-    tag: [ local, rootless, system ]
-    summary: rootless test
+/sys-rootless-local:
     test: >
         bash ./setup.sh &&
         loginctl enable-linger $ROOTLESS_USER &&
         chown -R $ROOTLESS_USER $TMT_TREE &&
         su - "$ROOTLESS_USER" -c "CI_DESIRED_NETWORK=netavark make -C $TMT_TREE localsystem"
     duration: 40m
 
-/remote-root:
-    tag: [ remote, root, system ]
-    summary: remote rootful test
+/sys-root-remote:
     test: >
         bash ./setup.sh &&
         make -C $TMT_TREE remotesystem
     duration: 40m
 
-/remote-rootless:
-    tag: [ remote, rootless, system ]
-    summary: remote rootless test
+/sys-rootless-remote:
     test: >
         bash ./setup.sh &&
         loginctl enable-linger $ROOTLESS_USER &&
         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