Skip to content

Commit

Permalink
Merge pull request #711 from SUSE/skip_ltss_container_checks
Browse files Browse the repository at this point in the history
Skip tests that depend on the BCI repo for the LTSS container
  • Loading branch information
dirkmueller authored Dec 21, 2024
2 parents ca8c2d0 + a238309 commit 3b947b4
Showing 1 changed file with 16 additions and 7 deletions.
23 changes: 16 additions & 7 deletions tests/test_all.py
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,7 @@
from bci_tester.data import INIT_CONTAINER
from bci_tester.data import KERNEL_MODULE_CONTAINER
from bci_tester.data import KIWI_CONTAINERS
from bci_tester.data import LTSS_BASE_CONTAINERS
from bci_tester.data import MICRO_CONTAINER
from bci_tester.data import MINIMAL_CONTAINER
from bci_tester.data import OS_PRETTY_NAME
Expand Down Expand Up @@ -256,10 +257,6 @@ def test_glibc_present(auto_container):
OS_VERSION not in ALLOWED_BCI_REPO_OS_VERSIONS,
reason="LTSS containers are known to be non-functional with BCI_repo ",
)
@pytest.mark.skipif(
OS_VERSION == "basalt",
reason="Basalt repos are known to be out of sync with IBS state",
)
@pytest.mark.parametrize(
"container", _CONTAINERS_WITH_VOLUME_MOUNT, indirect=True
)
Expand Down Expand Up @@ -329,7 +326,13 @@ def test_no_downgrade_on_install(container: ContainerData) -> None:
reason="AI containers include unpublished packages",
)
@pytest.mark.parametrize(
"container_per_test", CONTAINERS_WITH_ZYPPER_AS_ROOT, indirect=True
"container_per_test",
[
c
for c in CONTAINERS_WITH_ZYPPER_AS_ROOT
if c not in LTSS_BASE_CONTAINERS
],
indirect=True,
)
def test_no_orphaned_packages(container_per_test: ContainerData) -> None:
"""Check that containers do not contain any package that isn't also
Expand Down Expand Up @@ -464,7 +467,7 @@ def test_no_compat_packages(container):

@pytest.mark.parametrize(
"container",
ALL_CONTAINERS,
[c for c in ALL_CONTAINERS if c not in LTSS_BASE_CONTAINERS],
indirect=True,
)
def test_bci_eula_is_correctly_available(container: ContainerData) -> None:
Expand Down Expand Up @@ -571,7 +574,13 @@ def test_certificates_are_present(
reason="no included BCI repository - can't test",
)
@pytest.mark.parametrize(
"container_per_test", CONTAINERS_WITH_ZYPPER_AS_ROOT, indirect=True
"container_per_test",
[
c
for c in CONTAINERS_WITH_ZYPPER_AS_ROOT
if c not in LTSS_BASE_CONTAINERS
],
indirect=True,
)
def test_container_build_and_repo(container_per_test, host):
"""Test all containers with zypper in them whether at least the ``SLE_BCI``
Expand Down

0 comments on commit 3b947b4

Please sign in to comment.