Skip to content

Conversation

@lsm5
Copy link
Member

@lsm5 lsm5 commented Nov 10, 2025

See individual commits.

Checklist

Ensure you have completed the following checklist for your pull request to be reviewed:

  • Certify you wrote the patch or otherwise have the right to pass it on as an open-source patch by signing all
    commits. (git commit -s). (If needed, use git commit -s --amend). The author email must match
    the sign-off email address. See CONTRIBUTING.md
    for more information.
  • Referenced issues using Fixes: #00000 in commit message (if applicable)
  • Tests have been added/updated (or no tests are needed)
  • Documentation has been updated (or no documentation changes are needed)
  • All commits pass make validatepr (format/lint checks)
  • Release note entered in the section below (or None if no user-facing changes)

Does this PR introduce a user-facing change?

None

@openshift-ci openshift-ci bot added do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. release-note-none approved Indicates a PR has been approved by an approver from all required OWNERS files. labels Nov 10, 2025
@lsm5
Copy link
Member Author

lsm5 commented Nov 10, 2025

let me check if dnf exclusion can solve this issue for good.

@lsm5 lsm5 added the No New Tests Allow PR to proceed without adding regression tests label Nov 10, 2025
@lsm5 lsm5 changed the title Packit/TMT: Tmp disable podman-next for tests Packit/TMT: Exclude podman packages from podman-next for tests Nov 10, 2025
@lsm5 lsm5 marked this pull request as ready for review November 10, 2025 15:04
@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 Nov 10, 2025
@lsm5
Copy link
Member Author

lsm5 commented Nov 10, 2025

Alright, this is good to go. Podman is only installed from the packit copr in TMT envs, which is the one we want to test.

The cockpit tests never used the podman-next copr so there's no reason to keep it in the packit config.

@containers/podman-maintainers @martinpitt PTAL

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
Copy link
Contributor

openshift-ci bot commented Nov 10, 2025

[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

Comment on lines 129 to 130
- type: repository-file
id: https://copr.fedorainfracloud.org/coprs/rhcontainerbot/podman-next/repo/fedora-$releasever/rhcontainerbot-podman-next-fedora-$releasever.repo
Copy link
Contributor

Choose a reason for hiding this comment

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

I don't like this TBH -- seems to be prone to installing podman without matching dependencies? Isn't it often the case that newer podman versions need a newer crun/selinux policy etc.?

Your cited TF run is weird indeed. The dnf update -y podman crun conmon criu call is meant to upgrade to newer dependencies from the -next copr. And e.g. crun is much newer, it has a "102:" epoch in COPR and no epoch in Fedora. I can debug this, but it's certainly meant to be used.

Or asked the other way around: Do you expect -next to be tested as a group and want to have non-released dependencies in podman? Or expect podman main to work on all released distros without newer deps?

Copy link
Member Author

@lsm5 lsm5 Nov 11, 2025

Choose a reason for hiding this comment

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

@martinpitt I have used the ridiculous Epoch number on most, if not all, podman-next packages, but builds for all other coprs (like Packit) should use the default distro Epoch.

To use podman-next deps, I found simply adding the repo to packit config didn't suffice. We also needed to bump their priority in the TF env like this . I didn't see any such step in cockpit-podman.fmf and the TF log did show the packit copr rpm being tested. So, the podman-next repo in the cockpit job felt like a NOOP. That's why the removal here.

Yes, ideally, everything on main should be tested with podman-next, so how about I reuse the same dnf priority modification block in cockpit-podman.fmf? LMK.

Copy link
Contributor

Choose a reason for hiding this comment

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

Ah, thanks for the explanation! So TF adds these extra repo files with a high prio number (i.e. low priority, ignored) by default? Ugh..

Copy link
Contributor

Choose a reason for hiding this comment

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

In other words, adding the same fix to cockpit-podman.fmf sounds great!

Copy link
Member Author

Choose a reason for hiding this comment

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

@martinpitt great, I'll update this PR likewise. Thanks!

@timcoding1988
Copy link
Collaborator

LGTM

@lsm5 lsm5 force-pushed the packit-rpm-test branch 2 times, most recently from 450e8c3 to ca47f08 Compare November 12, 2025 14:32
@packit-as-a-service
Copy link

[NON-BLOCKING] Packit jobs failed. @containers/packit-build please check. Everyone else, feel free to ignore.

1 similar comment
@packit-as-a-service
Copy link

[NON-BLOCKING] Packit jobs failed. @containers/packit-build please check. Everyone else, feel free to ignore.

@lsm5 lsm5 removed the machine label Nov 12, 2025
@lsm5 lsm5 force-pushed the packit-rpm-test branch 3 times, most recently from 9559592 to 8b68207 Compare November 12, 2025 18:36
@@ -0,0 +1,12 @@
#!/usr/bin/env bash
Copy link
Member

Choose a reason for hiding this comment

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

should this script be moved into test/tmt/ instead?

The reason I am saying this is because hack/ is a used a lot in cirrus testing so we have a strict rule to trigger all tests anytime someone touches hack/

Given this is a tmt specific file maybe the location there would be better? I think that should trigger much less cirrus tests.

Copy link
Member Author

Choose a reason for hiding this comment

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

oh, good point RE: hack/ . Are there similar restrictions for contrib ? That script isn't being used by anything in test/tmt but used in plans, and I'd prefer not to put it in plans. If contrib is good, I'll prefer contrib.

Copy link
Member Author

Choose a reason for hiding this comment

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

worst case, I think I can just put in plans and move on.

Copy link
Member Author

Choose a reason for hiding this comment

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

Long term, might even be nice to put these in a separate template repo for reuse by all projects as this setup should largely be the same for our projects.

Copy link
Member

Choose a reason for hiding this comment

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

@lsm5 lsm5 force-pushed the packit-rpm-test branch 3 times, most recently from 32260af to 8b3eb34 Compare November 12, 2025 19:31
@lsm5 lsm5 marked this pull request as draft November 12, 2025 19:31
@openshift-ci openshift-ci bot added the do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. label Nov 12, 2025
@lsm5 lsm5 force-pushed the packit-rpm-test branch 7 times, most recently from 37e0c86 to 571dbb9 Compare November 13, 2025 15:02
@lsm5 lsm5 mentioned this pull request Nov 13, 2025
@lsm5
Copy link
Member Author

lsm5 commented Nov 13, 2025

I think this is good to go. Instead of bumping podman-next priority, I only removed the priority from testing-farm repo. Both cockpit and podman jobs show the expected rpms.

crun-1.25-1.20251107133746032335.main.1.g993ad9d5.fc44.x86_64
podman-6.0.0~dev-1.20251113184257723481.pr27488.1942.b87b73eb1c.fc44.x86_64

PTAL.

I'll keep this in draft until we merge #27271

This will fetch the highest packages from all repos present on the
environment.

TMT_TREE envvar is ok to use in this case as it will only be used on
upstream packit tests.

Signed-off-by: Lokesh Mandvekar <lsm5@redhat.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

approved Indicates a PR has been approved by an approver from all required OWNERS files. do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. No New Tests Allow PR to proceed without adding regression tests release-note-none

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants