From 93cebb570366f0182e4ed9b7ba6dbdefe0ba3660 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Frans=20F=C3=BCrst?= Date: Tue, 24 Dec 2024 12:08:19 +0100 Subject: [PATCH] Revert "containerized tests: makes container names unique" .. because it introduces Docker related timeout issues This reverts commit 225a4ef337d072a38151904060ff1ec21de53fdb. Change-Id: Id85b4589800fab07f369c9847186110a4f4d382c --- tests/docker/test_docker.py | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/tests/docker/test_docker.py b/tests/docker/test_docker.py index 2907d6f82ad..d1837b8fd68 100644 --- a/tests/docker/test_docker.py +++ b/tests/docker/test_docker.py @@ -5,7 +5,6 @@ # pylint: disable=redefined-outer-name -import hashlib import logging import os from pathlib import Path @@ -23,7 +22,6 @@ package_name, prepare_package, ) -from tests.testlib.repo import repo_path from tests.testlib.version import CMKVersion, git_tag_exists, version_from_env from cmk.ccc.version import Edition, Version, versions_compatible @@ -341,10 +339,7 @@ def test_container_agent(checkmk: CheckmkApp) -> None: ) def test_update(client: docker.DockerClient) -> None: pkg_version = version_from_env() - # make hash of the current workspace/checkout path part of container name in order - # to avoid conflicts with running `test_update` instances on the same node - workspace_id = hashlib.sha256(repo_path().as_posix().encode("utf-8")).hexdigest()[:10] - container_name = f"{pkg_version.branch}-monitoring-{workspace_id}" + container_name = "%s-monitoring" % pkg_version.branch update_compatibility = versions_compatible( Version.from_str(old_version.version), Version.from_str(pkg_version.version)