Skip to content

Commit

Permalink
Merge pull request #967 from askervin/5MR_e2e_fedora_kernel_cmdline
Browse files Browse the repository at this point in the history
e2e: fix isolcpus test on Fedora
  • Loading branch information
marquiz authored Dec 22, 2022
2 parents 0ac1bc7 + a11cda4 commit 7d464f9
Showing 1 changed file with 15 additions and 0 deletions.
15 changes: 15 additions & 0 deletions demo/lib/distro.bash
Original file line number Diff line number Diff line change
Expand Up @@ -529,6 +529,10 @@ fedora-install-containerd-pre() {
fedora-install-containernetworking-plugins
}

fedora-install-containerd-post() {
vm-command "systemctl enable containerd"
}

fedora-install-k8s() {
local repo="/etc/yum.repos.d/kubernetes.repo"
local base="https://packages.cloud.google.com/yum/repos/kubernetes-el7-\$basearch"
Expand Down Expand Up @@ -601,6 +605,17 @@ fi
EOF
}

fedora-set-kernel-cmdline() {
local e2e_defaults="$*"
vm-command "mkdir -p /etc/default; touch /etc/default/grub; sed -i '/e2e:fedora-set-kernel-cmdline/d' /etc/default/grub"
vm-command "echo 'GRUB_CMDLINE_LINUX_DEFAULT=\"\${GRUB_CMDLINE_LINUX_DEFAULT} ${e2e_defaults}\" # by e2e:fedora-set-kernel-cmdline' >> /etc/default/grub" || {
command-error "writing new command line parameters failed"
}
vm-command "grub2-mkconfig -o /boot/grub2/grub.cfg" || {
command-error "updating grub failed"
}
}

fedora-33-install-crio-pre() {
fedora-install-crio-version 1.20
}
Expand Down

0 comments on commit 7d464f9

Please sign in to comment.