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

images: add python3-pcp for RHEL images #6775

Merged
merged 3 commits into from
Aug 29, 2024
Merged
Show file tree
Hide file tree
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
2 changes: 1 addition & 1 deletion images/rhel-9-5
1 change: 0 additions & 1 deletion images/scripts/bootc.setup
Original file line number Diff line number Diff line change
Expand Up @@ -28,5 +28,4 @@ rm /var/cache/bootc.oci.tar
systemctl disable bootc-fetch-apply-updates.timer fstrim.timer logrotate.timer raid-check.timer

# reduce image size
rm -rf /var/log/journal/*
/var/lib/testvm/zero-disk.setup
1 change: 0 additions & 1 deletion images/scripts/ostree.setup
Original file line number Diff line number Diff line change
Expand Up @@ -45,5 +45,4 @@ done

# reduce image size
rpm-ostree cleanup --repomd
rm -rf /var/log/journal/*
/var/lib/testvm/zero-disk.setup
7 changes: 6 additions & 1 deletion images/scripts/rhel.setup
Original file line number Diff line number Diff line change
Expand Up @@ -182,6 +182,7 @@ openssl \
PackageKit \
pcp-libs \
pcp \
python3-pcp \
podman \
realmd \
redhat-logos \
Expand Down Expand Up @@ -248,6 +249,11 @@ if [ "${IMAGE#rhel-8*}" != "$IMAGE" ]; then
TEST_PACKAGES="${TEST_PACKAGES/wireguard-tools /}"
fi

# RHEL 8 still uses the C pcp bridge
if [ "${IMAGE#rhel-8*}" != "$IMAGE" ]; then
COCKPIT_DEPS="${COCKPIT_DEPS/python3-pcp /}"
fi

# vdo not available on centos/rhel 10
if [ "$IMAGE" = "centos-10" ] || [ "${IMAGE#rhel-10}" != "$IMAGE" ]; then
TEST_PACKAGES="${TEST_PACKAGES/ kmod-kvdo / }"
Expand Down Expand Up @@ -466,7 +472,6 @@ mkdir -p /var/log/journal

# Final tweaks

rm -rf /var/log/journal/*
# RHEL 7 does not enable systemd-coredump by default, later versions do
if ! grep -qr core_pattern /usr/lib/sysctl.d/; then
echo "kernel.core_pattern=|/usr/lib/systemd/systemd-coredump %p %u %g %s %t %e" > /etc/sysctl.d/50-coredump.conf
Expand Down
2 changes: 0 additions & 2 deletions images/scripts/services.setup
Original file line number Diff line number Diff line change
Expand Up @@ -207,7 +207,5 @@ chmod 755 /root/run-grafana
# disable automatic updates
systemctl disable --now zincati.service

rm -rf /var/log/journal/*

# reduce image size
/var/lib/testvm/zero-disk.setup
Loading