Merge branch 'main' into poo167683_fipsvendor-tests-gnutls

SUSE · Dec 5, 2024 · 3823aac · 3823aac
2 parents 0efac2d + c0ddba4
commit 3823aac
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 13 deletions.
diff --git a/bci_tester/data.py b/bci_tester/data.py
@@ -403,22 +403,31 @@ def create_BCI(
         image_type="kiwi",
         bci_type=ImageType.OS,
     )
+    BASE_FIPS_CONTAINERS.append(
+        create_BCI(
+            build_tag=f"{BCI_CONTAINER_PREFIX}/bci-base-fips:{OS_CONTAINER_TAG}",
+            bci_type=ImageType.OS,
+            available_versions=["tumbleweed"],
+        )
+    )
 else:
     BASE_CONTAINER = create_BCI(
         build_tag=f"{BCI_CONTAINER_PREFIX}/bci-base:{OS_CONTAINER_TAG}",
         image_type="kiwi",
         bci_type=ImageType.OS,
     )
     if TARGET not in ("dso",):
-        BASE_FIPS_CONTAINERS = [
+        BASE_FIPS_CONTAINERS.append(
             create_BCI(
                 build_tag=f"{BCI_CONTAINER_PREFIX}/bci-base-fips:{OS_CONTAINER_TAG}",
                 bci_type=ImageType.OS,
-                # TODO set to _DEFAULT_BASE_OS_VERSIONS once the fips containers are available
-                # everywhere
-                available_versions=("15.6",),
+                available_versions=[
+                    ver
+                    for ver in _DEFAULT_BASE_OS_VERSIONS
+                    if ver not in ("15.5",)
+                ],
             )
-        ]
+        )
     if TARGET in ("ibs", "ibs-cr", "ibs-released"):
         LTSS_BASE_CONTAINERS.extend(
             create_BCI(
@@ -695,7 +704,6 @@ def create_BCI(
 
 _MARIADB_VERSION_OS_MATRIX: Tuple[Tuple[str, Tuple[str, ...]], ...] = (
     ("10.11", ("15.6", "15.7")),
-    ("10.6", ("15.5",)),
     ("11.6", ("tumbleweed",)),
 )
 

diff --git a/pyproject.toml b/pyproject.toml
@@ -38,6 +38,8 @@ markers = [
     'bci-base-fips_15.5',
     'bci-base-fips_15.6',
     'bci-base-fips_15.7',
+    'bci-base-fips_16.0',
+    'bci-base-fips_latest',
     'bci-busybox_15.3',
     'bci-busybox_15.4',
     'bci-busybox_15.5',
@@ -94,10 +96,8 @@ markers = [
     'grafana_11',
     'kiwi_9.24',
     'kiwi_10.1',
-    'mariadb_10.6',
     'mariadb_10.11',
     'mariadb_11.6',
-    'mariadb-client_10.6',
     'mariadb-client_10.11',
     'mariadb-client_11.6',
     'nodejs_16',

diff --git a/tests/test_base.py b/tests/test_base.py
@@ -66,7 +66,6 @@ def test_base_size(container: ContainerData, container_runtime):
     :py:const:`base_container_max_size`
 
     """
-
     # the FIPS container is bigger too than the 15 SP3 base image
     is_fips_ctr = (
         container.container.baseurl
@@ -95,10 +94,10 @@ def test_base_size(container: ContainerData, container_runtime):
         }
     elif OS_VERSION in ("16.0",):
         base_container_max_size: Dict[str, int] = {
-            "x86_64": 154,
-            "aarch64": 174,
-            "ppc64le": 189,
-            "s390x": 155,
+            "x86_64": 100,
+            "aarch64": 126,
+            "ppc64le": 138,
+            "s390x": 99,
         }
     elif OS_VERSION in ("15.7",):
         base_container_max_size: Dict[str, int] = {