From 556b808989cfa4d6403b0376ff22d3fc9afdf046 Mon Sep 17 00:00:00 2001 From: Lokesh Mandvekar Date: Fri, 6 Sep 2024 16:20:26 +0530 Subject: [PATCH 1/2] Packit: separate out ELN build jobs ELN is neither Fedora nor RHEL, but more of a midstream between the two. It's best to split it out as a separate package set in packit. This will allow reusability of Fedora targets specified in copr_build jobs in other jobs. Signed-off-by: Lokesh Mandvekar --- .packit.yaml | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/.packit.yaml b/.packit.yaml index 25da438a6..44975464e 100644 --- a/.packit.yaml +++ b/.packit.yaml @@ -28,6 +28,8 @@ packages: specfile_path: rpm/crun.spec crun-rhel: specfile_path: rpm/crun.spec + crun-eln: + specfile_path: rpm/crun.spec srpm_build_deps: - git-archive-all @@ -49,6 +51,12 @@ jobs: targets: - fedora-all-x86_64 - fedora-all-aarch64 + + - job: copr_build + trigger: pull_request + packages: [crun-eln] + notifications: *copr_build_failure_notification + targets: - fedora-eln-x86_64 - fedora-eln-aarch64 From e3b5a263a68df34f5dcf6481084f749cc0550b25 Mon Sep 17 00:00:00 2001 From: Lokesh Mandvekar Date: Fri, 6 Sep 2024 16:29:43 +0530 Subject: [PATCH 2/2] Packit: Reuse Fedora targets wherever possible This commit uses 2 anchors, `fedora_copr_targets` and `fedora_targets` for copr and downstream jobs respectively. Signed-off-by: Lokesh Mandvekar --- .packit.yaml | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/.packit.yaml b/.packit.yaml index 44975464e..62c3b490e 100644 --- a/.packit.yaml +++ b/.packit.yaml @@ -48,7 +48,7 @@ jobs: notifications: &copr_build_failure_notification failure_comment: message: "Ephemeral COPR build failed. @containers/packit-build please check." - targets: + targets: &fedora_copr_targets - fedora-all-x86_64 - fedora-all-aarch64 @@ -102,9 +102,7 @@ jobs: notifications: &podman_system_test_fail_notification failure_comment: message: "podman system tests failed. @containers/packit-build please check." - targets: - - fedora-all-x86_64 - - fedora-all-aarch64 + targets: *fedora_copr_targets tf_extra_params: environments: - artifacts: @@ -146,7 +144,7 @@ jobs: - job: propose_downstream trigger: release packages: [crun-fedora] - dist_git_branches: + dist_git_branches: &fedora_targets - fedora-all - job: propose_downstream @@ -157,8 +155,7 @@ jobs: - job: koji_build trigger: commit - dist_git_branches: - - fedora-all + dist_git_branches: *fedora_targets - job: bodhi_update trigger: commit