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

Fix grub2-tools setup & dependencies in grub2 template tests #12764

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
3 changes: 3 additions & 0 deletions Dockerfiles/test_suite-sle15
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,9 @@ ENV AUTH_KEYS=/root/.ssh/authorized_keys
ARG CLIENT_PUBLIC_KEY
ARG ADDITIONAL_PACKAGES

RUN zypper ar --no-gpgcheck http://download.opensuse.org/distribution/leap/15.5/repo/oss/ oss
RUN zypper refresh

RUN true \
&& zypper --non-interactive in openssh-clients openssh-server openscap-utils \
python3 python3-rpm tar gawk\
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,17 @@
# platform = multi_platform_all
{{%- if 'sle15' in product %}}
# packages = grub2,grubby
mkdir -p /boot/grub2
rm -f /boot/grub2/grub.cfg
{
echo 'menuentry "SLES Mocked" {'
echo 'linux mock'
echo '}'
} > /boot/grub2/grub.cfg
{{%- else %}}
# packages = grub2-tools,grubby
{{%- endif %}}


# Ensure the kernel command line for each installed kernel in the bootloader
grubby --update-kernel=ALL --remove-args="{{{ ARG_NAME }}}"
Expand Down
Loading