From b9691547cabd3186413f89e19840871143da25bb Mon Sep 17 00:00:00 2001 From: Lokesh Mandvekar Date: Wed, 11 Sep 2024 18:09:34 +0530 Subject: [PATCH 1/2] [skip-ci] 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 (cherry picked from commit 5f6a22dc1b8b6e5de50cd20e6a542a22e02b1ac6) Signed-off-by: Lokesh Mandvekar --- .packit.yaml | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/.packit.yaml b/.packit.yaml index e840b9e025..e906b83061 100644 --- a/.packit.yaml +++ b/.packit.yaml @@ -110,12 +110,19 @@ jobs: - job: koji_build trigger: commit - packages: [podman-fedora] + sidetag_group: podman-releases dist_git_branches: - fedora-all - job: bodhi_update - trigger: commit - packages: [podman-fedora] + trigger: koji_build + sidetag_group: podman-releases + # Dependencies are not rpm dependencies, but packages that should go in the + # same bodhi update + # Ref: https://packit.dev/docs/fedora-releases-guide/releasing-multiple-packages + dependencies: + - buildah + - containers-common + - skopeo dist_git_branches: - - fedora-branched # rawhide updates are created automatically + - fedora-all From a17fd8c0aa31f25e4c0c3d2cf1a24f86ab8390fb Mon Sep 17 00:00:00 2001 From: Lokesh Mandvekar Date: Wed, 11 Sep 2024 18:13:20 +0530 Subject: [PATCH 2/2] [skip-ci] 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. Signed-off-by: Lokesh Mandvekar (cherry picked from commit 297ec1c08352a0a06220ff3a38943b16f0296762) Signed-off-by: Lokesh Mandvekar --- .packit.yaml | 27 ++++++++++++++++++++------- 1 file changed, 20 insertions(+), 7 deletions(-) diff --git a/.packit.yaml b/.packit.yaml index e906b83061..cc47847bcc 100644 --- a/.packit.yaml +++ b/.packit.yaml @@ -14,6 +14,8 @@ packages: specfile_path: rpm/podman.spec podman-rhel: specfile_path: rpm/podman.spec + podman-eln: + specfile_path: rpm/podman.spec srpm_build_deps: - git-archive-all @@ -32,8 +34,21 @@ jobs: message: "Ephemeral COPR build failed. @containers/packit-build please check." enable_net: true targets: - fedora-all-x86_64: {} - fedora-all-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 + + - job: copr_build + trigger: pull_request + packages: [podman-eln] + notifications: *packit_build_failure_notification + enable_net: true + targets: fedora-eln-x86_64: additional_repos: - "https://kojipkgs.fedoraproject.org/repos/eln-build/latest/x86_64/" @@ -98,7 +113,7 @@ jobs: trigger: release update_release: false packages: [podman-fedora] - dist_git_branches: + dist_git_branches: &fedora_targets - fedora-all - job: propose_downstream @@ -111,8 +126,7 @@ jobs: - job: koji_build trigger: commit sidetag_group: podman-releases - dist_git_branches: - - fedora-all + dist_git_branches: *fedora_targets - job: bodhi_update trigger: koji_build @@ -124,5 +138,4 @@ jobs: - buildah - containers-common - skopeo - dist_git_branches: - - fedora-all + dist_git_branches: *fedora_targets