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

TMT: Replace adjust with prepare conditionals #1631

Merged
merged 1 commit into from
Jan 15, 2025

Conversation

lsm5
Copy link
Member

@lsm5 lsm5 commented Dec 31, 2024

The previous adjust conditionals ended up skipping copr repo and package upgrade steps for CentOS Stream environments.

This should be resolved by directly using prepare and when keywords for setting conditions.

@lsm5 lsm5 force-pushed the tmt-centos-stream-followup branch from 5367cf6 to 184f7a2 Compare December 31, 2024 14:04
@lsm5 lsm5 force-pushed the tmt-centos-stream-followup branch 11 times, most recently from 34b6e2c to 575d5b5 Compare January 1, 2025 13:12
Copy link

podman system tests failed. @containers/packit-build please check.

@lsm5 lsm5 force-pushed the tmt-centos-stream-followup branch 5 times, most recently from e5a5058 to 7a09663 Compare January 2, 2025 09:43
@lsm5
Copy link
Member Author

lsm5 commented Jan 2, 2025

The latest patch seems to work though the commented out idiomatic TMT seems to fail. I'll check if there's any quick resolution from TMT folks, if not, we should just go ahead with this.

Ensure all envs are setup correctly.

Signed-off-by: Lokesh Mandvekar <[email protected]>
@lsm5 lsm5 force-pushed the tmt-centos-stream-followup branch from 41b1261 to 65484cb Compare January 15, 2025 10:59
@lsm5 lsm5 marked this pull request as ready for review January 15, 2025 12:49
@lsm5 lsm5 changed the title Packit+TMT: Fix copr repo enablement on upstream CentOS Stream tests TMT: Replace adjust with prepare conditionals Jan 15, 2025
@lsm5 lsm5 marked this pull request as draft January 15, 2025 12:56
@lsm5 lsm5 marked this pull request as ready for review January 15, 2025 13:24
@lsm5
Copy link
Member Author

lsm5 commented Jan 15, 2025

With this setup, packages from podman-next copr are fetched as expected on packit jobs and only the official packages are fetched on official distro PRs: https://gitlab.com/redhat/centos-stream/rpms/crun/-/merge_requests/120 and https://src.fedoraproject.org/rpms/crun/pull-request/92 . So, this should be good to go.

@giuseppe @flouthoc PTAL

Copy link
Member

@giuseppe giuseppe left a comment

Choose a reason for hiding this comment

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

LGTM

@giuseppe giuseppe merged commit 8d17a91 into containers:main Jan 15, 2025
46 checks passed
@lsm5 lsm5 deleted the tmt-centos-stream-followup branch January 15, 2025 14:52
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants