From 12bc13f280e68da97b3e0771f503ae16e5a4dfef Mon Sep 17 00:00:00 2001 From: Lili Deng Date: Thu, 19 Sep 2024 11:51:42 +0800 Subject: [PATCH] workaround for mariner 3.0, no /dev/disk/azure/scsi1 created --- lisa/sut_orchestrator/azure/features.py | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/lisa/sut_orchestrator/azure/features.py b/lisa/sut_orchestrator/azure/features.py index fb187b0980..efab4142b4 100644 --- a/lisa/sut_orchestrator/azure/features.py +++ b/lisa/sut_orchestrator/azure/features.py @@ -1649,10 +1649,12 @@ def _get_scsi_data_disks(self) -> List[str]: if len(files) == 0 and self._node.capability.disk.data_disk_count != 0: os = self._node.os # https://docs.microsoft.com/en-us/troubleshoot/azure/virtual-machines/troubleshoot-device-names-problems#get-the-latest-azure-storage-rules # noqa: E501 - # there are known issues on ubuntu 16.04 and rhel 9.0 + # there are known issues on ubuntu 16.04, rhel 9.0 and mariner 3.0 # try to workaround it - if (isinstance(os, Ubuntu) and os.information.release <= "16.04") or ( - isinstance(os, Redhat) and os.information.release >= "9.0" + if ( + (isinstance(os, Ubuntu) and os.information.release <= "16.04") + or (isinstance(os, Redhat) and os.information.release >= "9.0") + or isinstance(os, CBLMariner) ): self._log.debug( "download udev rules to construct a set of "