Skip to content

Commit 280d7f1

Browse files
cgwaltersJohan-Liebert1
authored andcommitted
ci: Fix kernel downgrade to let scriptlets run with TMPDIR=/var/tmp
Undo hacky --noscripts - this was working around an rpm-ostree bug (working on a PR for that). Assisted-by: OpenCode (claude-sonnet-4-6@default) Signed-off-by: Colin Walters <walters@verbum.org>
1 parent 041a433 commit 280d7f1

2 files changed

Lines changed: 4 additions & 24 deletions

File tree

hack/provision-fetch.sh

Lines changed: 4 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -155,21 +155,10 @@ case "${kernel_ver}" in
155155
"${koji_base}/${pkg}-${koji_kver}-${koji_krel}.${arch}.rpm" \
156156
-o "${kernel_td}/${pkg}.rpm"
157157
done
158-
# Skip scriptlets: kernel-core's posttrans runs `kernel-install add`
159-
# which calls rpm-ostree, and that fails inside a container build.
160-
# We manually run depmod afterward since it's the only useful
161-
# scriptlet the kernel packages would otherwise execute.
162-
dnf -y install --allowerasing --setopt=tsflags=noscripts "${kernel_td}"/*.rpm
163-
/sbin/depmod -a "${koji_kver}-${koji_krel}.$(uname -m)"
164-
# Remove any leftover module directories for the old kernel (e.g.
165-
# initramfs.img generated by the base image build is not RPM-owned
166-
# so dnf does not clean it up).
167-
for old_kmod_dir in /usr/lib/modules/*; do
168-
kd_ver=$(basename "${old_kmod_dir}")
169-
if [[ "${kd_ver}" != "${koji_kver}-"* ]]; then
170-
rm -rf "${old_kmod_dir}"
171-
fi
172-
done
158+
# TMPDIR=/var/tmp: works around an rpm-ostree bug
159+
TMPDIR=/var/tmp dnf -y downgrade "${kernel_td}"/*.rpm
160+
# Note: we should also fix the Fedora kernel packaging to not copy symvers into /boot
161+
rm -rf /boot/*
173162
rm -rf "${kernel_td}"
174163
trap - EXIT
175164
;;

tmt/tests/Dockerfile.upgrade-source

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -40,15 +40,6 @@ if [[ "${variant}" == composefs* ]]; then
4040
echo 'add_dracutmodules+=" bootc "' > /etc/dracut.conf.d/50-bootc-composefs.conf
4141
kver=$(cd /usr/lib/modules && echo *)
4242
dracut --force --kver "$kver" "/usr/lib/modules/$kver/initramfs.img"
43-
else
44-
. /usr/lib/os-release
45-
46-
if [[ $ID == "fedora" && $VERSION_ID == "44" ]]; then
47-
# We skip kernel postinstall in "provision-fetch" which would've generated
48-
# the initrd, so we do it ourselves here
49-
kver=$(cd /usr/lib/modules && echo *)
50-
dracut --force --kver "$kver" "/usr/lib/modules/$kver/initramfs.img"
51-
fi
5243
fi
5344

5445
rm -rf /run/provision

0 commit comments

Comments
 (0)