Logic rework of fmf files and add dnf4 build steps

plans/integration/behave-createrepo_c.fmf → plans/dnf4/integration/behave-createrepo_c.fmf

@@ -5,4 +5,4 @@ execute:
     script: |
         $TMT_PLANS_DATA/ci-dnf-stack/container-test \
         --suite createrepo_c \
-        run
+        -c dnf4-testing-container run

plans/dnf4/integration/behave-dnf.fmf

@@ -0,0 +1,9 @@
+summary: Run Behave Test Suite - DNF
+tag: dnf
+execute:
+    how: tmt
+    script: |
+        $TMT_PLANS_DATA/ci-dnf-stack/container-test \
+        --suite dnf \
+        run
+

plans/dnf4/main.fmf

@@ -0,0 +1,18 @@
+summary: Prepare the DNF4 environment
+
+prepare+:
+    - name: Checkout DNF4 branch
+      how: shell
+      script: |
+        if [ "$PACKIT_UPSTREAM_NAME" == "dnf" ]; then
+            git -C $TMT_PLANS_DATA/ci-dnf-stack checkout dnf-4-stack
+        fi
+
+    - name: Build DNF4 testing container
+      how: shell
+      script: |
+        $TMT_PLANS_DATA/ci-dnf-stack/container-test \
+        build \
+        --base $( echo "$@distro" | tr '-' ':') \
+        --container-arg="--env=COPR=$PACKIT_COPR_PROJECT" \
+        --container-arg="--env=COPR_RPMS=$PACKIT_COPR_RPMS"

plans/dnf5/integration/behave-createrepo_c.fmf

@@ -0,0 +1,8 @@
+summary: Run Behave Test Suite - CREATEREPO_C
+tag: createrepo_c
+execute:
+    how: tmt
+    script: |
+        $TMT_PLANS_DATA/ci-dnf-stack/container-test \
+        --suite createrepo_c \
+        -c dnf5-testing-container run

plans/integration/behave-dnf5.fmf → plans/dnf5/integration/behave-dnf5.fmf

@@ -3,6 +3,7 @@ tag: dnf5
 execute:
     how: tmt
     script: |
-        $TMT_PLANS_DATA/ci-dnf-stack/container-test run \
+        $TMT_PLANS_DATA/ci-dnf-stack/container-test \
+        -c dnf5-testing-container run \
         --tags dnf5 \
         --command dnf5

plans/integration/behave-dnf5daemon.fmf → plans/dnf5/integration/behave-dnf5daemon.fmf

@@ -3,6 +3,7 @@ tag: dnf5daemon
 execute:
     how: tmt
     script: |
-        $TMT_PLANS_DATA/ci-dnf-stack/container-test run \
+        $TMT_PLANS_DATA/ci-dnf-stack/container-test \
+        -c dnf5-testing-container run \
         --tags dnf5daemon \
         --command dnf5daemon-client

plans/dnf5/main.fmf

@@ -0,0 +1,12 @@
+summary: Prepare the DNF5 environment
+
+prepare+:
+    - name: Build DNF5 testing container
+      how: shell
+      script: |
+        $TMT_PLANS_DATA/ci-dnf-stack/container-test \
+        -c dnf5-testing-container build \
+        --base $( echo "$@distro" | tr '-' ':') \
+        --container-arg="--env=COPR=$PACKIT_COPR_PROJECT" \
+        --container-arg="--env=COPR_RPMS=$PACKIT_COPR_RPMS" \
+

plans/main.fmf

@@ -1,6 +1,6 @@
-summary: Prepare CI DNF Stack
+summary: Prepare Tests
 
-tag: integration
+tag: all
 
 prepare:
     - name: Install packages to build fedora container
@@ -21,11 +21,3 @@ prepare:
           git -C $TMT_PLANS_DATA/ci-dnf-stack checkout --track pull-request/$PACKIT_SOURCE_BRANCH
           git -C $TMT_PLANS_DATA/ci-dnf-stack rebase $PACKIT_TARGET_BRANCH
         fi
-
-    - name: Build testing container
-      how: shell
-      script: |
-        $TMT_PLANS_DATA/ci-dnf-stack/container-test build \
-        --base $( echo "$@distro" | tr '-' ':') \
-        --container-arg="--env=COPR=$PACKIT_COPR_PROJECT" \
-        --container-arg="--env=COPR_RPMS=$PACKIT_COPR_RPMS"