Merge pull request #1023 from SUSE/nvidia-versions

Add more nvidia versions

Author: alexandrevicenzi

bci_tester/data.py

@@ -365,7 +365,6 @@ def create_BCI(
         **kwargs: additional keyword arguments are forwarded to the constructor
             of the :py:class:`~pytest_container.DerivedContainer`
     """
-    build_tag_base = build_tag.rpartition("/")[2]
     marks = []
     if extra_marks:
         for m in extra_marks:
@@ -418,6 +417,11 @@ def create_BCI(
     if OS_VERSION in (
         available_versions or list(_DEFAULT_NONBASE_OS_VERSIONS)
     ):
+        if build_tag.startswith("third-party/"):
+            build_tag_base = build_tag.partition("/")[2].replace("/", "-")
+        else:
+            build_tag_base = build_tag.rpartition("/")[2]
+
         marks.append(pytest.mark.__getattr__(build_tag_base.replace(":", "_")))
 
     if TARGET == "manual":
@@ -650,11 +654,16 @@ def create_BCI(
         custom_entry_point="/bin/sh",
     )
     for driver_ver, os_ver in (
+        ("590.48.01", "15.7"),
         ("580.126.16", "15.7"),
         ("580.126.09", "15.7"),
         ("580.105.08", "15.7"),
         ("580.95.05", "15.7"),
         ("580.82.07", "15.7"),
+        ("575.57.08", "15.7"),
+        ("570.211.01", "15.7"),
+        ("570.195.03", "15.7"),
+        ("550.163.01", "15.7"),
     )
 ]
 

pyproject.toml

@@ -103,11 +103,16 @@ markers = [
     'dotnet-sdk_8.0',
     'dotnet-sdk_9.0',
     'dotnet-sdk_10.0',
-    'driver_580.82.07-sles15.7',
-    'driver_580.95.05-sles15.7',
-    'driver_580.105.08-sles15.7',
-    'driver_580.126.09-sles15.7',
-    'driver_580.126.16-sles15.7',
+    'nvidia-driver_590.48.01-sles15.7',
+    'nvidia-driver_580.126.16-sles15.7',
+    'nvidia-driver_580.126.09-sles15.7',
+    'nvidia-driver_580.105.08-sles15.7',
+    'nvidia-driver_580.95.05-sles15.7',
+    'nvidia-driver_580.82.07-sles15.7',
+    'nvidia-driver_575.57.08-sles15.7',
+    'nvidia-driver_570.211.01-sles15.7',
+    'nvidia-driver_570.195.03-sles15.7',
+    'nvidia-driver_550.163.01-sles15.7',
     'firefox-esr_esr',
     'gcc_7',
     'gcc_13',

tests/test_nvidia.py

@@ -32,6 +32,7 @@
 def test_image_content(container_per_test: ContainerData):
     """Test that ensures that required files exist in the image."""
     version = container_per_test.inspect.config.env.get("DRIVER_VERSION")
+    branch = int(container_per_test.inspect.config.env.get("DRIVER_BRANCH"))
 
     files = [
         "/drivers/README.md",
@@ -43,19 +44,35 @@ def test_image_content(container_per_test: ContainerData):
         "/usr/local/bin/nvidia-driver-selector.sh",
     ]
 
-    ### TODO test kernel modules via modinfo/modprobe
-    files += [
-        "/opt/open/nvidia-drm.ko.zst",
-        "/opt/open/nvidia-modeset.ko.zst",
-        "/opt/open/nvidia-peermem.ko.zst",
-        "/opt/open/nvidia-uvm.ko.zst",
-        "/opt/open/nvidia.ko.zst",
-        "/opt/proprietary/nvidia-drm.ko.zst",
-        "/opt/proprietary/nvidia-modeset.ko.zst",
-        "/opt/proprietary/nvidia-peermem.ko.zst",
-        "/opt/proprietary/nvidia-uvm.ko.zst",
-        "/opt/proprietary/nvidia.ko.zst",
-    ]
+    # since 575 drivers use DKMS and are compressed
+    # prior 575 driveers use KMP and are not compressed
+    # TODO: test kernel modules via modinfo/modprobe
+    if branch >= 575:
+        files += [
+            "/opt/open/nvidia-drm.ko.zst",
+            "/opt/open/nvidia-modeset.ko.zst",
+            "/opt/open/nvidia-peermem.ko.zst",
+            "/opt/open/nvidia-uvm.ko.zst",
+            "/opt/open/nvidia.ko.zst",
+            "/opt/proprietary/nvidia-drm.ko.zst",
+            "/opt/proprietary/nvidia-modeset.ko.zst",
+            "/opt/proprietary/nvidia-peermem.ko.zst",
+            "/opt/proprietary/nvidia-uvm.ko.zst",
+            "/opt/proprietary/nvidia.ko.zst",
+        ]
+    else:
+        files += [
+            "/opt/open/nvidia-drm.ko",
+            "/opt/open/nvidia-modeset.ko",
+            "/opt/open/nvidia-peermem.ko",
+            "/opt/open/nvidia-uvm.ko",
+            "/opt/open/nvidia.ko",
+            "/opt/proprietary/nvidia-drm.ko",
+            "/opt/proprietary/nvidia-modeset.ko",
+            "/opt/proprietary/nvidia-peermem.ko",
+            "/opt/proprietary/nvidia-uvm.ko",
+            "/opt/proprietary/nvidia.ko",
+        ]
 
     for filename in files:
         assert container_per_test.connection.file(filename).exists