Skip to content

Commit

Permalink
Merge pull request #12764 from teacup-on-rockingchair/fix_grub_templa…
Browse files Browse the repository at this point in the history
…te_sle15_automatus_tests

Fix grub2-tools setup & dependencies in grub2 template tests
  • Loading branch information
jan-cerny authored Dec 29, 2024
2 parents c87fd08 + 699f146 commit 8cb84dc
Show file tree
Hide file tree
Showing 2 changed files with 15 additions and 0 deletions.
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

0 comments on commit 8cb84dc

Please sign in to comment.