Skip to content

Commit 0c34c1f

Browse files
e2e: try to load both kvm modules for Intel and AMD
We should not assume our runner is surely running on top of AMD machine. It's safe to try to load kvm modules for both CPUs. ref. cybozu-go/fin#154 In addition, avoid unloading these modules beforehand. Probably it's not necessary. Signed-off-by: Satoru Takeuchi <satoru.takeuchi@gmail.com>
1 parent b1f80dc commit 0c34c1f

1 file changed

Lines changed: 2 additions & 4 deletions

File tree

.github/actions/set-up-kvm-for-e2e-tests/action.yaml

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,5 @@ runs:
2323
sudo chmod 777 /var/run/libvirt/libvirt-sock
2424
sudo ls -la /var/run/libvirt/libvirt-sock
2525
ls -l /dev/kvm
26-
sudo rmmod kvm_amd
27-
sudo rmmod kvm
28-
sudo modprobe -a kvm
29-
sudo modprobe -a kvm_amd
26+
# x86 GitHub Runner can be one of Intel and AMD, so try both.
27+
sudo modprobe -a kvm_intel || sudo modprobe -a kvm_amd

0 commit comments

Comments
 (0)