Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[skip-ci] Packit: Enable sidetags for bodhi updates #23927

Merged
merged 2 commits into from
Sep 16, 2024

Conversation

lsm5
Copy link
Member

@lsm5 lsm5 commented Sep 11, 2024

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.

Does this PR introduce a user-facing change?

None

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 <[email protected]>
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 <[email protected]>
@openshift-ci openshift-ci bot added release-note-none do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. approved Indicates a PR has been approved by an approver from all required OWNERS files. labels Sep 11, 2024
@lsm5 lsm5 marked this pull request as ready for review September 11, 2024 13:54
@openshift-ci openshift-ci bot removed the do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. label Sep 11, 2024
@lsm5
Copy link
Member Author

lsm5 commented Sep 11, 2024

Related PRs:

  1. [skip-ci] Packit: Enable sidetags for bodhi updates common#2159
  2. [skip-ci] Packit: Enable sidetags for bodhi updates skopeo#2421
  3. [skip-ci] Packit: Enable sidetags for bodhi updates buildah#5730

@containers/podman-maintainers PTAL . These 3 PRs as well as this very PR should be merged together (IOW, no releases in between) and cherrypicked to the release branches relevant to Fedora.
Ref: https://packit.dev/docs/fedora-releases-guide/releasing-multiple-packages

@Luap99
Copy link
Member

Luap99 commented Sep 16, 2024

Do we actually want buildah skopeo podman all in one update? All the patch versions are released on their own timing so if I understand the packit docs correctly you then have to manually trigger the bodhi updates for each of the patch releases?

I guess overall this make sense, i.e. we have important c-common config files in the rpm so shipping all of them at once ensure configs and docs match all our tools and allow for better testing but I am not sure if the patch (z) versions causes more work on your end.

@lsm5
Copy link
Member Author

lsm5 commented Sep 16, 2024

Do we actually want buildah skopeo podman all in one update?

Given we often release everything together except some of the z-ones, let's give this way a shot.

All the patch versions are released on their own timing so if I understand the packit docs correctly you then have to manually trigger the bodhi updates for each of the patch releases?

We shouldn't need manual bodhi updates. Instead we'll need a human to run /packit koji-tag --all-branches on the Fedora dist-git PRs for packages that don't need new builds. I feel this would be a lot less work than manual kojis and bodhis. The sidetag support is also very new in packit, and I think we'll be among the first ones to try it, if not the very first.

I guess overall this make sense, i.e. we have important c-common config files in the rpm so shipping all of them at once ensure configs and docs match all our tools and allow for better testing but I am not sure if the patch (z) versions causes more work on your end.

Let's see what the experience is like. Would also be a good datapoint for the packit devs.

Copy link
Member

@Luap99 Luap99 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

/lgtm

@openshift-ci openshift-ci bot added the lgtm Indicates that a PR is ready to be merged. label Sep 16, 2024
Copy link
Contributor

openshift-ci bot commented Sep 16, 2024

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: lsm5, Luap99

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Needs approval from an approver in each of these files:

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

@openshift-merge-bot openshift-merge-bot bot merged commit 156efe5 into containers:main Sep 16, 2024
41 checks passed
@lsm5
Copy link
Member Author

lsm5 commented Sep 17, 2024

/cherrypick v5.2

@openshift-cherrypick-robot
Copy link
Collaborator

@lsm5: #23927 failed to apply on top of branch "v5.2":

Applying: Packit: Enable sidetags for bodhi updates
Applying: Packit: split out ELN jobs and reuse fedora downstream targets
Using index info to reconstruct a base tree...
M	.packit.yaml
Falling back to patching base and 3-way merge...
Auto-merging .packit.yaml
CONFLICT (content): Merge conflict in .packit.yaml
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0002 Packit: split out ELN jobs and reuse fedora downstream targets
When you have resolved this problem, run "git am --continue".
If you prefer to skip this patch, run "git am --skip" instead.
To restore the original branch and stop patching, run "git am --abort".

In response to this:

/cherrypick v5.2

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes-sigs/prow repository.

@lsm5 lsm5 deleted the packit-sidetag branch October 25, 2024 11:06
@stale-locking-app stale-locking-app bot added the locked - please file new issue/PR Assist humans wanting to comment on an old issue or PR with locked comments. label Jan 24, 2025
@stale-locking-app stale-locking-app bot locked as resolved and limited conversation to collaborators Jan 24, 2025
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
approved Indicates a PR has been approved by an approver from all required OWNERS files. lgtm Indicates that a PR is ready to be merged. locked - please file new issue/PR Assist humans wanting to comment on an old issue or PR with locked comments. release-note-none
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants