From 0494df68b05eda2af0d07fcbff8204b764a4b35d Mon Sep 17 00:00:00 2001 From: Lokesh Mandvekar Date: Wed, 11 Sep 2024 17:47:47 +0530 Subject: [PATCH 1/2] Packit: Enable sidetags for bodhi updates Packit now has sidetag support for adding multiple builds into a single bodhi update. Since we release c/ccommon, skopeo, buildah and podman often almoost simultaneously, we should release them to Fedora in a single bodhi update using sidetags so all builds can be tested together. Signed-off-by: Lokesh Mandvekar --- .packit.yaml | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/.packit.yaml b/.packit.yaml index 88a663c2c89..ce89b375632 100644 --- a/.packit.yaml +++ b/.packit.yaml @@ -89,12 +89,14 @@ jobs: dist_git_branches: - c10s + # Fedora Koji build - job: koji_build trigger: commit + sidetag_group: podman-releases + # Dependents are not rpm dependencies, but the package whose bodhi update + # should include this package. + # Ref: https://packit.dev/docs/fedora-releases-guide/releasing-multiple-packages + dependents: + - podman dist_git_branches: - fedora-all - - - job: bodhi_update - trigger: commit - dist_git_branches: - - fedora-branched # rawhide updates are created automatically From b2defd39e729147815422217a4a5bdabd9409b57 Mon Sep 17 00:00:00 2001 From: Lokesh Mandvekar Date: Wed, 11 Sep 2024 17:50:36 +0530 Subject: [PATCH 2/2] Packit: split out ELN jobs and reuse fedora downstream targets ELN is kind of a midway between Fedora and RHEL, so it's best to mention ELN jobs separately. This will also allow reusing fedora targets using YAML anchors for TMT tests. This commit also mentions fedora-40 targets separately for copr_build jobs so that once fedora-41 is released, fedora-40 jobs continue to trigger. Signed-off-by: Lokesh Mandvekar --- .packit.yaml | 28 +++++++++++++++++++--------- 1 file changed, 19 insertions(+), 9 deletions(-) diff --git a/.packit.yaml b/.packit.yaml index ce89b375632..698707511df 100644 --- a/.packit.yaml +++ b/.packit.yaml @@ -14,6 +14,8 @@ packages: specfile_path: rpm/buildah.spec buildah-rhel: specfile_path: rpm/buildah.spec + buildah-eln: + specfile_path: rpm/buildah.spec srpm_build_deps: - make @@ -26,12 +28,21 @@ jobs: failure_comment: message: "Ephemeral COPR build failed. @containers/packit-build please check." targets: - fedora-development-x86_64: {} - fedora-development-aarch64: {} - fedora-latest-x86_64: {} - fedora-latest-aarch64: {} - fedora-latest-stable-x86_64: {} - fedora-latest-stable-aarch64: {} + - fedora-development-x86_64 + - fedora-development-aarch64 + - fedora-latest-x86_64 + - fedora-latest-aarch64 + - fedora-latest-stable-x86_64 + - fedora-latest-stable-aarch64 + - fedora-40-x86_64 + - fedora-40-aarch64 + enable_net: true + + - job: copr_build + trigger: pull_request + packages: [buildah-eln] + notifications: *copr_build_failure_notification + targets: fedora-eln-x86_64: additional_repos: - "https://kojipkgs.fedoraproject.org/repos/eln-build/latest/x86_64/" @@ -78,7 +89,7 @@ jobs: trigger: release packages: [buildah-fedora] update_release: false - dist_git_branches: + dist_git_branches: &fedora_targets - fedora-all # Sync to CentOS Stream @@ -98,5 +109,4 @@ jobs: # Ref: https://packit.dev/docs/fedora-releases-guide/releasing-multiple-packages dependents: - podman - dist_git_branches: - - fedora-all + dist_git_branches: *fedora_targets