Add initial testing for the 16.1 base containers

Author: dirkmueller

.github/workflows/ci.yaml

@@ -206,6 +206,14 @@ jobs:
             os_version: "16.0"
           - toxenv: repository
             os_version: "16.0"
+          - toxenv: all
+            os_version: "16.1"
+          - toxenv: base
+            os_version: "16.1"
+          - toxenv: minimal
+            os_version: "16.1"
+          - toxenv: metadata
+            os_version: "16.1"
           - toxenv: base
             testing_target: factory-totest
             os_version: "tumbleweed"

bci_tester/data.py

@@ -42,6 +42,7 @@
     "15.6",
     "15.7",
     "16.0",
+    "16.1",
     "tumbleweed",
 )
 
@@ -73,7 +74,7 @@
 _DEFAULT_NONBASE_OS_VERSIONS = ("15.7", "16.0", "tumbleweed")
 
 # Test base containers by default for these versions
-_DEFAULT_BASE_OS_VERSIONS = ("15.7", "16.0", "tumbleweed")
+_DEFAULT_BASE_OS_VERSIONS = ("15.7", "16.0", "16.1", "tumbleweed")
 
 # List the released versions of SLE, used for supportability and EULA tests
 RELEASED_SLE_VERSIONS = (
@@ -181,7 +182,7 @@
     if BASEURL.endswith("/"):
         BASEURL = BASEURL[:-1]
 else:
-    if OS_VERSION in ("tumbleweed", "16.0"):
+    if OS_VERSION in ("tumbleweed", "16.0", "16.1"):
         DISTNAME = OS_VERSION
     else:
         DISTNAME = f"sle-{OS_MAJOR_VERSION}-sp{OS_SP_VERSION}"

tests/test_all.py

@@ -166,7 +166,8 @@ def test_product(auto_container):
 
 
 @pytest.mark.skipif(
-    OS_VERSION in ("15.4", "15.5", "15.6", "tumbleweed"),
+    OS_VERSION in ("15.4", "15.5", "15.6", "tumbleweed")
+    or OS_VERSION not in RELEASED_SLE_VERSIONS,
     reason="suse trademark only available in certain SLE versions",
 )
 def test_suse_trademark(auto_container):
@@ -429,6 +430,10 @@ def test_no_orphaned_packages(container_per_test: ContainerData) -> None:
     assert not orphaned_packages.difference(known_orphaned_packages)
 
 
+@pytest.mark.skipif(
+    OS_VERSION not in ALLOWED_BCI_REPO_OS_VERSIONS,
+    reason="no included BCI repository - can't test zypper verify",
+)
 @pytest.mark.parametrize(
     "container", CONTAINERS_WITH_ZYPPER_AS_ROOT, indirect=True
 )

tests/test_base.py

@@ -13,11 +13,13 @@
 from pytest_container.container import container_and_marks_from_pytest_param
 from pytest_container.runtime import LOCALHOST
 
+from bci_tester.data import ALLOWED_BCI_REPO_OS_VERSIONS
 from bci_tester.data import BASE_CONTAINER
 from bci_tester.data import BASE_FIPS_CONTAINERS
 from bci_tester.data import LTSS_BASE_CONTAINERS
 from bci_tester.data import LTSS_BASE_FIPS_CONTAINERS
 from bci_tester.data import OS_VERSION
+from bci_tester.data import RELEASED_LTSS_VERSIONS
 from bci_tester.data import TARGET
 from bci_tester.data import ZYPP_CREDENTIALS_DIR
 from bci_tester.fips import ALL_DIGESTS
@@ -300,6 +302,11 @@ def test_all_openssl_hashes_known(auto_container):
 
 
 @pytest.mark.parametrize("container_per_test", [DIND_CONTAINER], indirect=True)
+@pytest.mark.skipif(
+    OS_VERSION not in RELEASED_LTSS_VERSIONS
+    or OS_VERSION not in ALLOWED_BCI_REPO_OS_VERSIONS,
+    reason="No repo available to install docker",
+)
 @pytest.mark.skipif(
     not DOCKER_SELECTED,
     reason="Docker in docker can only be tested when using the docker runtime",
@@ -312,11 +319,8 @@ def test_dind(container_per_test):
     :py:const:`DIND_CONTAINER`).
 
     """
-    container_per_test.connection.run_expect([0], "zypper -n in docker")
-    container_per_test.connection.run_expect([0], "docker ps")
-    res = container_per_test.connection.run_expect(
-        [0],
-        "docker run --rm registry.opensuse.org/opensuse/tumbleweed:latest "
-        "/usr/bin/ls",
+    container_per_test.connection.check_output("zypper -n in docker")
+    container_per_test.connection.check_output("docker ps")
+    assert "res" in container_per_test.connection.check_output(
+        "docker run --rm registry.suse.com/bci/bci-busybox:latest /usr/bin/ls",
     )
-    assert "etc" in res.stdout

tests/test_metadata.py

@@ -670,7 +670,7 @@ def test_disturl(
             "obs://build.suse.de/SUSE:SLFO:Products:PublicCloud:Toolchain:2025"
             in disturl
         )
-    elif OS_VERSION == "16.0":
+    elif OS_VERSION.startswith("16."):
         if baseurl.netloc == "registry.opensuse.org":
             assert (
                 f"obs://build.opensuse.org/devel:BCI:16.{OS_SP_VERSION}"