Packit/TMT: organize test plans based on rpm dependency

Unit and validate tests don't need to depend on the built rpm and it's
sufficient to run them on only 1 target.

So, it's more convenient to re-org the test plans based on rpm
dependency.

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

.packit.yaml

@@ -90,7 +90,18 @@ jobs:
     project: podman-next
     enable_net: true
 
-  # Unit tests on Fedora
+  # validate and unit tests
+  # rpm independent and sufficient to run on only one env
+  - job: tests
+    trigger: pull_request
+    packages: [aardvark-dns-fedora] # Include this else it will create multiple jobs
+    skip_build: true
+    targets:
+      - fedora-latest-stable
+    tmt_plan: "/plans/no-rpm"
+    identifier: "no-rpm"
+
+  # Integration tests on Fedora
   - job: tests
     trigger: pull_request
     packages: [aardvark-dns-fedora]
@@ -103,8 +114,10 @@ jobs:
         - artifacts:
           - type: repository-file
             id: https://copr.fedorainfracloud.org/coprs/rhcontainerbot/podman-next/repo/fedora-$releasever/rhcontainerbot-podman-next-fedora-$releasever.repo
+    tmt_plan: "/plans/rpm"
+    identifier: "rpm-fedora"
 
-  # Unit tests on CentOS Stream
+  # Integration tests on CentOS Stream
   - job: tests
     trigger: pull_request
     packages: [aardvark-dns-centos]
@@ -115,6 +128,8 @@ jobs:
         - artifacts:
           - type: repository-file
             id: https://copr.fedorainfracloud.org/coprs/rhcontainerbot/podman-next/repo/centos-stream-$releasever/rhcontainerbot-podman-next-centos-stream-$releasever.repo
+    tmt_plan: "/plans/rpm"
+    identifier: "rpm-centos"
 
   # Sync to Fedora
   - job: propose_downstream

plans/main.fmf

@@ -19,18 +19,15 @@ prepare:
         dnf -y upgrade --allowerasing
       order: 20
 
-/upstream:
-    summary: Run tests on upstream PRs
+/no-rpm:
+    summary: Run tests independent of rpm
     discover+:
-        filter: tag:upstream
+        filter: tag:no-rpm
     adjust+:
         - enabled: false
           when: initiator is not defined or initiator != packit
 
-/downstream:
-    summary: Run tests on bodhi / errata and dist-git PRs
+/rpm:
+    summary: Run tests on the rpm
     discover+:
-        filter: tag:downstream
-    adjust+:
-        - enabled: false
-          when: initiator == packit
+        filter: tag:rpm

test/tmt/main.fmf

@@ -1,28 +1,26 @@
-# Only common dependencies that are NOT required to run netavark-tests.sh are
-# specified here. Everything else is in netavark-tests.sh.
-require:
-    - aardvark-dns-tests
-    - cargo
-    - clippy
-    - rustfmt
-
-adjust:
-    duration: 10m
-    when: arch == aarch64
-
 /validate:
-    tag: upstream
+    tag: [ no-rpm, validate ]
     summary: Validate test
     test: make -C ../.. validate
+    require:
+        - clippy
+        - rustfmt
 
 /unit:
-    tag: upstream
-    summary: Unit test
+    tag: [ no-rpm, unit ]
+    summary: Unit tests
     test: make -C ../.. unit
+    require:
+        - cargo
 
 /integration:
-    tag: [ upstream, downstream]
+    tag: [ rpm, integration ]
     summary: Integration tests
     test: bash test_integration.sh
     environment:
         AARDVARK: /usr/libexec/podman/aardvark-dns
+    require:
+        - aardvark-dns-tests
+    adjust:
+        duration: 10m
+        when: arch == aarch64

test/tmt/test_integration.sh

@@ -2,7 +2,7 @@
 
 set -exo pipefail
 
-rpm -q aardvark-dns aardvark-dns-tests netavark nftables
+rpm -q aardvark-dns aardvark-dns-tests netavark
 
 cd /usr/share/aardvark-dns/
 bats test/