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

Fix CI #12759

Merged
merged 1 commit into from
Jan 6, 2022
Merged

Fix CI #12759

merged 1 commit into from
Jan 6, 2022

Conversation

rhatdan
Copy link
Member

@rhatdan rhatdan commented Jan 6, 2022

crun should be available in f35.

[ NO NEW TESTS NEEDED]

Signed-off-by: Daniel J Walsh [email protected]

@openshift-ci openshift-ci bot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Jan 6, 2022
@rhatdan
Copy link
Member Author

rhatdan commented Jan 6, 2022

@containers/podman-maintainers PTAL
@edsantiago @cevich @giuseppe PTAL

# Force a crun version that has this fix: https://github.com/containers/crun/pull/819
# FIXME: Remove once a fixed crun made its way into Fedora
if test "$OS_RELEASE_VER" == "35"; then
yum upgrade -y https://kojipkgs.fedoraproject.org//work/tasks/684/80280684/crun-1.3-2.fc35.x86_64.rpm
Copy link
Member

Choose a reason for hiding this comment

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

So, is the problem that this version has been wiped from mirrors? If so, does this actually do what you think it does? Since the CI VMs are (presumably) static, won't this just leave them with a very-old (pre-1.3.2) version of crun?

Let's see what CI does, but my gut is telling me that we should maybe, instead of deleting this block, s/1.3-2/1.4-1/ at least until @cevich returns from PTO

Copy link
Member

@edsantiago edsantiago Jan 6, 2022

Choose a reason for hiding this comment

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

Followup: yeah, package_versions is showing crun-1.3-1, which is presumably the problem that the lines above were trying to fix. I think that, until the CI VMs get rebuilt, the solution needs to be s/1.3-2/1.4-1/

Copy link
Member Author

Choose a reason for hiding this comment

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

Can we just do a yum update crun?

Copy link
Member

Choose a reason for hiding this comment

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

Yes, I think that would be even better. Good thinking, and I'm sorry for not stepping back to suggest that. Juggling too many things this morning!

crun should be available in f35.

[ NO NEW TESTS NEEDED]

Signed-off-by: Daniel J Walsh <[email protected]>
@mheon
Copy link
Member

mheon commented Jan 6, 2022

LGTM whenever tests go green

@openshift-ci openshift-ci bot added the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Jan 6, 2022
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
/hold

@openshift-ci openshift-ci bot added the lgtm Indicates that a PR is ready to be merged. label Jan 6, 2022
@openshift-ci
Copy link
Contributor

openshift-ci bot commented Jan 6, 2022

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: giuseppe, rhatdan

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

@rhatdan
Copy link
Member Author

rhatdan commented Jan 6, 2022

/hold cancel

@openshift-ci openshift-ci bot removed the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Jan 6, 2022
@openshift-merge-robot openshift-merge-robot merged commit c0b3df8 into containers:main Jan 6, 2022
Copy link
Member

@vrothberg vrothberg left a comment

Choose a reason for hiding this comment

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

LGTM

cevich added a commit to cevich/podman that referenced this pull request Jan 10, 2022
Specifically, this brings in `crun 1.4-1` allowing removal of a
temporary workaround.  Ref:

containers#12759

Signed-off-by: Chris Evich <[email protected]>
@github-actions github-actions bot added the locked - please file new issue/PR Assist humans wanting to comment on an old issue or PR with locked comments. label Sep 22, 2023
@github-actions github-actions bot locked as resolved and limited conversation to collaborators Sep 22, 2023
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.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

6 participants