Skip to content

Commit fd6f656

Browse files
committed
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>
1 parent 42cebc8 commit fd6f656

1 file changed

Lines changed: 24 additions & 28 deletions

File tree

‎.packit.yml‎

Lines changed: 24 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -1,42 +1,38 @@
1-
jobs:
2-
- job: tests
3-
trigger: pull_request
4-
branch: main
1+
_:
2+
common-test-config: &common-test-config
3+
job: tests
4+
branch: master
55
identifier: "integration-upstream"
6-
labels:
7-
- integration-pr
86
use_internal_tf: true
97
targets:
10-
- fedora-37-x86_64
11-
- fedora-37-s390x
12-
- fedora-37-ppc64le
8+
# [NOTE] There needs to be a matching target among the Copr targets,
9+
# because of the default mapping and filtering (to avoid invalid values).
10+
# In this case (no build), it is a bug, see packit/packit-service#2841
11+
# Yet, the `rawhide` has no effect as there is no Copr build happening.
12+
fedora-rawhide-x86_64:
13+
distros: [Fedora-37-Updated]
14+
fedora-rawhide-s390x:
15+
distros: [Fedora-37-Updated]
16+
fedora-rawhide-ppc64le:
17+
distros: [Fedora-37-Updated]
1318
skip_build: true
1419
manual_trigger: true
1520
tmt_plan: kpatch-integration-upstream
1621
fmf_url: https://gitlab.com/redhat/centos-stream/tests/kernel/test-plans.git
1722
fmf_ref: main
1823
tf_extra_params:
19-
environment:
24+
environments:
2025
- variables:
21-
KPATCH_REV: "$PACKIT_COMMIT_SHA"
26+
KPATCH_REV: "$PACKIT_COMMIT_SHA"
27+
28+
jobs:
29+
- <<: *common-test-config
30+
# [NOTE] Runs only for PRs to be merged into `master`
31+
trigger: pull_request
32+
labels:
33+
- integration-pr
2234

23-
- job: tests
35+
- <<: *common-test-config
2436
trigger: commit
25-
branch: main
26-
identifier: "integration-upstream"
2737
labels:
2838
- integration-commit
29-
use_internal_tf: true
30-
targets:
31-
- fedora-37-x86_64
32-
- fedora-37-s390x
33-
- fedora-37-ppc64le
34-
skip_build: true
35-
manual_trigger: true
36-
tmt_plan: kpatch-integration-upstream
37-
fmf_url: https://gitlab.com/redhat/centos-stream/tests/kernel/test-plans.git
38-
fmf_ref: main
39-
tf_extra_params:
40-
environment:
41-
- variables:
42-
KPATCH_REV: "$PACKIT_COMMIT_SHA"

0 commit comments

Comments
 (0)