aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--.github/workflows/zfs-tests-functional.yml11
-rw-r--r--.github/workflows/zfs-tests-sanity.yml11
2 files changed, 22 insertions, 0 deletions
diff --git a/.github/workflows/zfs-tests-functional.yml b/.github/workflows/zfs-tests-functional.yml
index eacc95ae1..aad3d552b 100644
--- a/.github/workflows/zfs-tests-functional.yml
+++ b/.github/workflows/zfs-tests-functional.yml
@@ -45,6 +45,17 @@ jobs:
sudo sed -i.bak 's/updates/extra updates/' /etc/depmod.d/ubuntu.conf
sudo depmod
sudo modprobe zfs
+ # Workaround for cloud-init bug
+ # see https://github.com/openzfs/zfs/issues/12644
+ FILE=/lib/udev/rules.d/10-cloud-init-hook-hotplug.rules
+ if [ -r "${FILE}" ]; then
+ HASH=$(md5sum "${FILE}" | awk '{ print $1 }')
+ if [ "${HASH}" = "121ff0ef1936cd2ef65aec0458a35772" ]; then
+ # Just shove a zd* exclusion right above the hotplug hook...
+ sudo sed -i -e s/'LABEL="cloudinit_hook"'/'KERNEL=="zd*", GOTO="cloudinit_end"\n&'/ "${FILE}"
+ sudo udevadm control --reload-rules
+ fi
+ fi
# Workaround to provide additional free space for testing.
# https://github.com/actions/virtual-environments/issues/2840
sudo rm -rf /usr/share/dotnet
diff --git a/.github/workflows/zfs-tests-sanity.yml b/.github/workflows/zfs-tests-sanity.yml
index 40a7f8ba5..4df49461e 100644
--- a/.github/workflows/zfs-tests-sanity.yml
+++ b/.github/workflows/zfs-tests-sanity.yml
@@ -41,6 +41,17 @@ jobs:
sudo sed -i.bak 's/updates/extra updates/' /etc/depmod.d/ubuntu.conf
sudo depmod
sudo modprobe zfs
+ # Workaround for cloud-init bug
+ # see https://github.com/openzfs/zfs/issues/12644
+ FILE=/lib/udev/rules.d/10-cloud-init-hook-hotplug.rules
+ if [ -r "${FILE}" ]; then
+ HASH=$(md5sum "${FILE}" | awk '{ print $1 }')
+ if [ "${HASH}" = "121ff0ef1936cd2ef65aec0458a35772" ]; then
+ # Just shove a zd* exclusion right above the hotplug hook...
+ sudo sed -i -e s/'LABEL="cloudinit_hook"'/'KERNEL=="zd*", GOTO="cloudinit_end"\n&'/ "${FILE}"
+ sudo udevadm control --reload-rules
+ fi
+ fi
# Workaround to provide additional free space for testing.
# https://github.com/actions/virtual-environments/issues/2840
sudo rm -rf /usr/share/dotnet