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.

Sign up for GitHub

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

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion contrib/cirrus/setup_environment.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -121,8 +121,9 @@ case "$OS_RELEASE_ID" in
# 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 •
edited
Loading

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!

yum upgrade -y crun
fi

if ((CONTAINER==0)); then
# All SELinux distros need this for systemd-in-a-container
msg "Enabling container_manage_cgroup"
Expand Down