Merge pull request #933 from rewenila/mcpo

Update mcpo container name to open-webui-mcpo

Author: dirkmueller

bci_tester/data.py

@@ -1048,8 +1048,8 @@ def create_BCI(
     forwarded_ports=[PortForwarding(container_port=8080)],
 )
 
-MCPO_CONTAINER = create_BCI(
-    build_tag=f"{SAC_CONTAINER_PREFIX}/mcpo:0",
+OPEN_WEBUI_MCPO_CONTAINER = create_BCI(
+    build_tag=f"{SAC_CONTAINER_PREFIX}/open-webui-mcpo:0",
     bci_type=ImageType.SAC_APPLICATION,
     available_versions=["15.6-ai"],
     custom_entry_point="mcpo",
@@ -1386,14 +1386,14 @@ def create_BCI(
     *KIOSK_XORG_CONTAINERS,
     *KIOSK_XORG_CLIENT_CONTAINERS,
     *KIOSK_PULSEAUDIO_CONTAINERS,
-    MCPO_CONTAINER,
     MICRO_CONTAINER,
     MICRO_FIPS_CONTAINER,
     MINIMAL_CONTAINER,
     OLLAMA_CONTAINER,
     MILVUS_CONTAINER,
     PYTORCH_CONTAINER,
     OPENWEBUI_CONTAINER,
+    OPEN_WEBUI_MCPO_CONTAINER,
     OPENWEBUI_PIPELINES_CONTAINER,
     VLLM_OPENAI_CONTAINER,
     LMCACHE_VLLM_OPENAI_CONTAINER,

pyproject.toml

@@ -109,7 +109,6 @@ markers = [
     'git_latest',
     'helm_3',
     'helm_latest',
-    'mcpo_0',
     'milvus_2.4',
     'nginx_1.21',
     'nginx_latest',
@@ -152,6 +151,7 @@ markers = [
     'openjdk-devel_25',
     'ollama_0',
     'open-webui_0',
+    'open-webui-mcpo_0',
     'open-webui-pipelines_0',
     'pcp_5',
     'pcp_6',

tests/test_ai.py

@@ -8,11 +8,11 @@
 
 from bci_tester.data import LMCACHE_LMSTACK_ROUTER_CONTAINER
 from bci_tester.data import LMCACHE_VLLM_OPENAI_CONTAINER
-from bci_tester.data import MCPO_CONTAINER
 from bci_tester.data import MILVUS_CONTAINER
 from bci_tester.data import OLLAMA_CONTAINER
 from bci_tester.data import OPENWEBUI_CONTAINER
 from bci_tester.data import OPENWEBUI_PIPELINES_CONTAINER
+from bci_tester.data import OPEN_WEBUI_MCPO_CONTAINER
 from bci_tester.data import PYTORCH_CONTAINER
 from bci_tester.data import SUSE_AI_OBSERVABILITY_EXTENSION_RUNTIME
 from bci_tester.data import SUSE_AI_OBSERVABILITY_EXTENSION_SETUP
@@ -22,7 +22,7 @@
     OLLAMA_CONTAINER,
     OPENWEBUI_CONTAINER,
     MILVUS_CONTAINER,
-    MCPO_CONTAINER,
+    OPEN_WEBUI_MCPO_CONTAINER,
     PYTORCH_CONTAINER,
     SUSE_AI_OBSERVABILITY_EXTENSION_RUNTIME,
     SUSE_AI_OBSERVABILITY_EXTENSION_SETUP,
@@ -178,7 +178,7 @@ def test_lmstack_router_health(container):
 
 @pytest.mark.parametrize(
     "container_per_test",
-    [MCPO_CONTAINER],
+    [OPEN_WEBUI_MCPO_CONTAINER],
     indirect=["container_per_test"],
 )
 def test_mcpo_health(container_per_test):

tests/test_metadata.py

@@ -68,7 +68,6 @@
 from bci_tester.data import LTSS_BASE_FIPS_CONTAINERS
 from bci_tester.data import MARIADB_CLIENT_CONTAINERS
 from bci_tester.data import MARIADB_CONTAINERS
-from bci_tester.data import MCPO_CONTAINER
 from bci_tester.data import MICRO_CONTAINER
 from bci_tester.data import MICRO_FIPS_CONTAINER
 from bci_tester.data import MILVUS_CONTAINER
@@ -80,6 +79,7 @@
 from bci_tester.data import OPENJDK_DEVEL_CONTAINERS
 from bci_tester.data import OPENWEBUI_CONTAINER
 from bci_tester.data import OPENWEBUI_PIPELINES_CONTAINER
+from bci_tester.data import OPEN_WEBUI_MCPO_CONTAINER
 from bci_tester.data import OS_SP_VERSION
 from bci_tester.data import OS_VERSION
 from bci_tester.data import OS_VERSION_ID
@@ -339,7 +339,11 @@ def _get_container_ref(
             "lmcache-lmstack-router",
             ImageType.SAC_APPLICATION,
         ),
-        (MCPO_CONTAINER, "mcpo", ImageType.SAC_APPLICATION),
+        (
+            OPEN_WEBUI_MCPO_CONTAINER,
+            "open-webui-mcpo",
+            ImageType.SAC_APPLICATION,
+        ),
     ]
     + [(STUNNEL_CONTAINER, "stunnel", ImageType.APPLICATION)]
     + [