From fd6f6565a3aea3f2927f1f638f952ee56e0f4a6c Mon Sep 17 00:00:00 2001
From: Matej Focko <mfocko@redhat.com>
Date: Mon, 25 Aug 2025 21:27:22 +0200
Subject: [PATCH 1/2] packit: fix config

- Add note about meaning of `branch` with `pull_request` trigger
- Fix the main branch (main -> master)
- Explicitly map targets
  - Also report a bug with regards to that packit/packit-service#2841
- TF extra params use `environments` (correct the typo)
  - Correct the indentation with `environments[].variables`
- Factor out 1:1 configuration of tests to `_` helper key to lower the
  noise in the diffs

Signed-off-by: Matej Focko <mfocko@redhat.com>
---
 .packit.yml | 52 ++++++++++++++++++++++++----------------------------
 1 file changed, 24 insertions(+), 28 deletions(-)

diff --git a/.packit.yml b/.packit.yml
index c6f13760d..a7575bde1 100644
--- a/.packit.yml
+++ b/.packit.yml
@@ -1,42 +1,38 @@
-jobs:
-  - job: tests
-    trigger: pull_request
-    branch: main
+_:
+  common-test-config: &common-test-config
+    job: tests
+    branch: master
     identifier: "integration-upstream"
-    labels:
-      - integration-pr
     use_internal_tf: true
     targets:
-      - fedora-37-x86_64
-      - fedora-37-s390x
-      - fedora-37-ppc64le
+      # [NOTE] There needs to be a matching target among the Copr targets,
+      # because of the default mapping and filtering (to avoid invalid values).
+      # In this case (no build), it is a bug, see packit/packit-service#2841
+      # Yet, the `rawhide` has no effect as there is no Copr build happening.
+      fedora-rawhide-x86_64:
+        distros: [Fedora-37-Updated]
+      fedora-rawhide-s390x:
+        distros: [Fedora-37-Updated]
+      fedora-rawhide-ppc64le:
+        distros: [Fedora-37-Updated]
     skip_build: true
     manual_trigger: true
     tmt_plan: kpatch-integration-upstream
     fmf_url: https://gitlab.com/redhat/centos-stream/tests/kernel/test-plans.git
     fmf_ref: main
     tf_extra_params:
-      environment:
+      environments:
         - variables:
-          KPATCH_REV: "$PACKIT_COMMIT_SHA"
+            KPATCH_REV: "$PACKIT_COMMIT_SHA"
+
+jobs:
+  - <<: *common-test-config
+    # [NOTE] Runs only for PRs to be merged into `master`
+    trigger: pull_request
+    labels:
+      - integration-pr
 
-  - job: tests
+  - <<: *common-test-config
     trigger: commit
-    branch: main
-    identifier: "integration-upstream"
     labels:
       - integration-commit
-    use_internal_tf: true
-    targets:
-      - fedora-37-x86_64
-      - fedora-37-s390x
-      - fedora-37-ppc64le
-    skip_build: true
-    manual_trigger: true
-    tmt_plan: kpatch-integration-upstream
-    fmf_url: https://gitlab.com/redhat/centos-stream/tests/kernel/test-plans.git
-    fmf_ref: main
-    tf_extra_params:
-      environment:
-        - variables:
-          KPATCH_REV: "$PACKIT_COMMIT_SHA"

From be69bf3a82600c850993b7be0739f6b9d3734d7e Mon Sep 17 00:00:00 2001
From: Yulia Kopkova <ykopkova@redhat.com>
Date: Tue, 26 Aug 2025 15:53:11 -0400
Subject: [PATCH 2/2] packit: config improvements

- Do not set KPATCH_REV in the config.
It is defined using PACKIT_COMMIT_SHA in the test plan.
- Rename the common configuration for the test job
with the upstream kernel

Signed-off-by: Yulia Kopkova <ykopkova@redhat.com>
---
 .packit.yml | 10 +++-------
 1 file changed, 3 insertions(+), 7 deletions(-)

diff --git a/.packit.yml b/.packit.yml
index a7575bde1..cb65b224a 100644
--- a/.packit.yml
+++ b/.packit.yml
@@ -1,5 +1,5 @@
 _:
-  common-test-config: &common-test-config
+  common-upstream-kernel-test-config: &common-upstream-kernel-test-config
     job: tests
     branch: master
     identifier: "integration-upstream"
@@ -20,19 +20,15 @@ _:
     tmt_plan: kpatch-integration-upstream
     fmf_url: https://gitlab.com/redhat/centos-stream/tests/kernel/test-plans.git
     fmf_ref: main
-    tf_extra_params:
-      environments:
-        - variables:
-            KPATCH_REV: "$PACKIT_COMMIT_SHA"
 
 jobs:
-  - <<: *common-test-config
+  - <<: *common-upstream-kernel-test-config
     # [NOTE] Runs only for PRs to be merged into `master`
     trigger: pull_request
     labels:
       - integration-pr
 
-  - <<: *common-test-config
+  - <<: *common-upstream-kernel-test-config
     trigger: commit
     labels:
       - integration-commit