Skip to content

Commit 7d464f9

Browse files
authored
Merge pull request #967 from askervin/5MR_e2e_fedora_kernel_cmdline
e2e: fix isolcpus test on Fedora
2 parents 0ac1bc7 + a11cda4 commit 7d464f9

File tree

1 file changed

+15
-0
lines changed

1 file changed

+15
-0
lines changed

demo/lib/distro.bash

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -529,6 +529,10 @@ fedora-install-containerd-pre() {
529529
fedora-install-containernetworking-plugins
530530
}
531531

532+
fedora-install-containerd-post() {
533+
vm-command "systemctl enable containerd"
534+
}
535+
532536
fedora-install-k8s() {
533537
local repo="/etc/yum.repos.d/kubernetes.repo"
534538
local base="https://packages.cloud.google.com/yum/repos/kubernetes-el7-\$basearch"
@@ -601,6 +605,17 @@ fi
601605
EOF
602606
}
603607

608+
fedora-set-kernel-cmdline() {
609+
local e2e_defaults="$*"
610+
vm-command "mkdir -p /etc/default; touch /etc/default/grub; sed -i '/e2e:fedora-set-kernel-cmdline/d' /etc/default/grub"
611+
vm-command "echo 'GRUB_CMDLINE_LINUX_DEFAULT=\"\${GRUB_CMDLINE_LINUX_DEFAULT} ${e2e_defaults}\" # by e2e:fedora-set-kernel-cmdline' >> /etc/default/grub" || {
612+
command-error "writing new command line parameters failed"
613+
}
614+
vm-command "grub2-mkconfig -o /boot/grub2/grub.cfg" || {
615+
command-error "updating grub failed"
616+
}
617+
}
618+
604619
fedora-33-install-crio-pre() {
605620
fedora-install-crio-version 1.20
606621
}

0 commit comments

Comments
 (0)