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

test: Install podman 2.0.4 from updates-testing #478

Merged
merged 1 commit into from
Aug 3, 2020
Merged
Changes from all commits
Commits
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
6 changes: 4 additions & 2 deletions test/vm.install
Original file line number Diff line number Diff line change
Expand Up @@ -46,8 +46,10 @@ if [ -d /var/tmp/debian ]; then
systemctl disable docker.service io.podman.service
fi

# HACK: avoid leaking processes with podman < 2.0.4; see https://github.com/containers/podman/commit/2b6dd3fb4384
sed -i '/KillMode=process/d; s/Type=oneshot/Type=simple/' /lib/systemd/user/podman.service /lib/systemd/system/podman.service
if rpm -q podman >/dev/null 2>&1; then
Copy link
Member

Choose a reason for hiding this comment

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

Why not using 'else' branch? Seems a bit clearer but just nitpick of course :)

Copy link
Member Author

Choose a reason for hiding this comment

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

You mean for "Debian vs. not"? No particular reason, I suppose we don't support a third package format right now. The hack should disappear completely in a week anyway, though.

Copy link
Member

Choose a reason for hiding this comment

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

Yeah, as the condition is there just to avoid breaking debian. But fair enough since it is rather tmp thing :)

# HACK: podman 2.0.3 breaks API; upgrade to 2.0.4 in updates-testing
dnf update -y --enablerepo=updates-testing podman
fi

systemctl enable cockpit.socket

Expand Down