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

tests/kernel-replace: update to f38 kernel; drop cruft #2685

Merged
merged 1 commit into from
Oct 23, 2023
+3 −23
Merged

tests/kernel-replace: update to f38 kernel; drop cruft #2685

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
26 changes: 3 additions & 23 deletions tests/kola/rpm-ostree/kernel-replace
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ image=oci:$image_dir
image_pull=ostree-unverified-image:$image
tmp_imagedir=/var/tmp/fcos-tmp
arch=$(arch)
kver="6.0.7-301.fc37.${arch}"
kver="6.2.9-300.fc38.${arch}"

case "${AUTOPKGTEST_REBOOT_MARK:-}" in
"")
Expand All @@ -71,31 +71,11 @@ case "${AUTOPKGTEST_REBOOT_MARK:-}" in
td=$(mktemp -d)
cd ${td}
version=$(rpm-ostree --version | grep Version)
cat > dracut_call.sh << EOF
#!/bin/bash
# Temporary workaround for: https://github.com/coreos/rpm-ostree/issues/4190
# This has been fixed on rpm-ostree 2022.18 and this script will be removed
# once that version reaches the stable coreos stream.
if [[ "$version" == *"2023"* ]] || [[ "$version" == *"2022.19"* ]]; then
echo "Running rpm-ostree 2022.19 or newer.";
else
echo "Running rpm-ostree 2022.18 or older, rebuilding the initramfs.";
echo "Building initramfs for Kernel: $kver"
/usr/libexec/rpm-ostree/wrapped/dracut --tmpdir /tmp/ --no-hostonly --kver $kver --reproducible \
-v --add ostree -f /tmp/initramfs2.img
mv /tmp/initramfs2.img /lib/modules/$kver/initramfs.img
fi;
EOF
cat > Dockerfile << EOF
FROM localhost/fcos
RUN rpm-ostree cliwrap install-to-root /
ADD dracut_call.sh dracut_call.sh
RUN cat dracut_call.sh
# Once kernel-modules-core is in all supported releases, we can remove this conditional.
RUN if rpm -q kernel-modules-core; then echo "kernel-modules-core installed.. removing"; remove="--remove kernel-modules-core"; fi && \
chmod +x dracut_call.sh && rpm-ostree override replace \$remove \
https://koji.fedoraproject.org/koji/buildinfo?buildID=2084352 && \
./dracut_call.sh && \
RUN rpm-ostree override replace \
https://koji.fedoraproject.org/koji/buildinfo?buildID=2178613 && \
ostree container commit
EOF
# Older podman found in RHEL8 blows up without /etc/resolv.conf
Expand Down