Add valkey testing

Author: dirkmueller

bci_tester/data.py

@@ -1029,14 +1029,22 @@ def create_BCI(
     custom_entry_point="/bin/bash",
 )
 
-
 STUNNEL_CONTAINER = create_BCI(
     build_tag=f"{APP_CONTAINER_PREFIX}/stunnel:5",
     bci_type=ImageType.APPLICATION,
     custom_entry_point="/bin/sh",
     available_versions=["15.6", "15.7", "tumbleweed"],
 )
 
+VALKEY_CONTAINERS = [
+    create_BCI(
+        build_tag=f"{APP_CONTAINER_PREFIX}/valkey:{tag}",
+        bci_type=ImageType.APPLICATION,
+        available_versions=versions,
+        forwarded_ports=[PortForwarding(container_port=6379)],
+    )
+    for versions, tag in ((("tumbleweed", "15.6", "15.7"), "8.0"),)
+]
 
 CONTAINERS_WITH_ZYPPER = (
     [
@@ -1111,6 +1119,7 @@ def create_BCI(
     *MARIADB_CONTAINERS,
     STUNNEL_CONTAINER,
     *KUBECTL_CONTAINERS,
+    *VALKEY_CONTAINERS,
 ]
 
 
@@ -1171,7 +1180,7 @@ def create_BCI(
 
 ACC_CONTAINERS = POSTGRESQL_CONTAINERS
 
-#: Containers that are directly pulled from registry.suse.de
+#: Containers pulled from registry.suse.de
 ALL_CONTAINERS = CONTAINERS_WITH_ZYPPER + CONTAINERS_WITHOUT_ZYPPER
 
 

pyproject.toml

@@ -154,6 +154,7 @@ markers = [
     'bci-sle16-kernel-module-devel_16.0',
     'spack_0.23',
     'stunnel_5',
+    'valkey_8.0',
 ]
 
 [tool.ruff]

tests/test_metadata.py

@@ -89,6 +89,7 @@
 from bci_tester.data import SPACK_CONTAINERS
 from bci_tester.data import STUNNEL_CONTAINER
 from bci_tester.data import TOMCAT_CONTAINERS
+from bci_tester.data import VALKEY_CONTAINERS
 from bci_tester.data import ImageType
 from bci_tester.runtime_choice import PODMAN_SELECTED
 
@@ -286,6 +287,10 @@ def _get_container_label_prefix(
         (kea_container, "kea", ImageType.APPLICATION)
         for kea_container in KEA_CONTAINERS
     ]
+    + [
+        (valkey_container, "valkey", ImageType.APPLICATION)
+        for valkey_container in VALKEY_CONTAINERS
+    ]
 ]
 
 

tests/test_valkey.py

@@ -0,0 +1,30 @@
+"""This module contains the tests for the valkey container."""
+
+import socket
+
+from pytest_container.container import ContainerData
+from tenacity import retry
+from tenacity import stop_after_attempt
+from tenacity import wait_exponential
+
+from bci_tester.data import VALKEY_CONTAINERS
+
+CONTAINER_IMAGES = VALKEY_CONTAINERS
+
+
+def test_valkey_ping(auto_container: ContainerData):
+    """Test that we can reach valkey port successfully."""
+    host_port = auto_container.forwarded_ports[0].host_port
+
+    # Retry 5 times with exponential backoff delay
+    @retry(
+        wait=wait_exponential(multiplier=1, min=4, max=10),
+        stop=stop_after_attempt(5),
+    )
+    def check_valkey_response():
+        sock = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
+        sock.connect(("0.0.0.0", host_port))
+        sock.sendall(b"PING\n")
+        assert sock.recv(5) == b"+PONG"
+
+    check_valkey_response()

tox.ini

@@ -1,5 +1,5 @@
 [tox]
-envlist = {py36,py39,py310,py311,py312,py313}-unit, all, base, cosign, fips, init, dotnet, python, ruby, node, go, openjdk, openjdk_devel, rust, php, busybox, 389ds, metadata, minimal, multistage, repository, doc, lint, check_marks, pcp, distribution, postgres, git, helm, nginx, kernel_module, mariadb, tomcat, spack, gcc, prometheus, grafana, kiwi, postfix, ai, stunnel, kubectl, kea
+envlist = {py36,py39,py310,py311,py312,py313}-unit, all, base, cosign, fips, init, dotnet, python, ruby, node, go, openjdk, openjdk_devel, rust, php, busybox, 389ds, metadata, minimal, multistage, repository, doc, lint, check_marks, pcp, distribution, postgres, git, helm, nginx, kernel_module, mariadb, tomcat, spack, gcc, prometheus, grafana, kiwi, postfix, ai, stunnel, kubectl, kea, valkey
 skip_missing_interpreters = True
 
 [common]