Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions bci_tester/data.py
Original file line number Diff line number Diff line change
Expand Up @@ -1471,6 +1471,7 @@ def create_BCI(
*SPR_CONTAINERS,
*KUBEVIRT_CONTAINERS,
*KUBEVIRT_CDI_CONTAINERS,
*AMD_CONTAINERS,
*NVIDIA_CONTAINERS,
]

Expand Down
2 changes: 2 additions & 0 deletions tests/test_all.py
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@

from bci_tester.data import ALLOWED_BCI_REPO_OS_VERSIONS
from bci_tester.data import ALL_CONTAINERS
from bci_tester.data import AMD_CONTAINERS
from bci_tester.data import BASE_CONTAINER
from bci_tester.data import BCI_DEVEL_REPO
from bci_tester.data import BCI_REPO_NAME
Expand Down Expand Up @@ -499,6 +500,7 @@ def test_zypper_not_present_in_containers_without_it(
+ KIOSK_PULSEAUDIO_CONTAINERS
+ KIOSK_XORG_CONTAINERS
+ KUBEVIRT_CONTAINERS
+ AMD_CONTAINERS
+ NVIDIA_CONTAINERS
)
],
Expand Down
13 changes: 10 additions & 3 deletions tests/test_metadata.py
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@
from bci_tester.data import ACC_CONTAINERS
from bci_tester.data import ALERTMANAGER_CONTAINERS
from bci_tester.data import ALL_CONTAINERS
from bci_tester.data import AMD_CONTAINERS
from bci_tester.data import BASE_CONTAINER
from bci_tester.data import BASE_FIPS_CONTAINERS
from bci_tester.data import BIND_CONTAINERS
Expand Down Expand Up @@ -188,6 +189,7 @@ def _get_container_ref(
(PHP_8_CLI, "php", ImageType.LANGUAGE_STACK),
(PHP_8_FPM, "php-fpm", ImageType.LANGUAGE_STACK),
]
+ [(c, "amd-driver", ImageType.THIRD_PARTY) for c in AMD_CONTAINERS]
+ [(c, "nvidia-driver", ImageType.THIRD_PARTY) for c in NVIDIA_CONTAINERS]
+ [(c, "nginx", ImageType.APPLICATION) for c in NGINX_CONTAINERS]
+ [(c, "openjdk", ImageType.LANGUAGE_STACK) for c in OPENJDK_CONTAINERS]
Expand Down Expand Up @@ -490,7 +492,10 @@ def test_general_labels(
ImageType.SAC_APPLICATION,
):
assert labels["com.suse.eula"] == "sle-eula"
elif container_name in ("nvidia-driver",):
elif container_name in (
"amd-driver",
"nvidia-driver",
):
assert labels["com.suse.eula"] == "sle-beta"
else:
assert labels["com.suse.eula"] == (
Expand Down Expand Up @@ -841,8 +846,10 @@ def test_reference(
"base",
):
reference_name = "sle15" if OS_VERSION == "15.5" else "tumbleweed"
if OS_VERSION in ("15.7-third-party", "16.0-third-party"):
reference_name = reference_name.replace("-", "/")
if container_name in ("nvidia-driver",):
reference_name = "nvidia/driver"
if container_name in ("amd-driver",):
reference_name = "amd/amdgpu-driver"
assert reference_name in reference

if OS_VERSION == "tumbleweed":
Expand Down
Loading