Skip to content

Commit

Permalink
Revert "containerized tests: makes container names unique"
Browse files Browse the repository at this point in the history
.. because it introduces Docker related timeout issues

This reverts commit 225a4ef337d072a38151904060ff1ec21de53fdb.

Change-Id: Id85b4589800fab07f369c9847186110a4f4d382c
  • Loading branch information
Frans Fürst committed Dec 24, 2024
1 parent 30b948d commit 93cebb5
Showing 1 changed file with 1 addition and 6 deletions.
7 changes: 1 addition & 6 deletions tests/docker/test_docker.py
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@

# pylint: disable=redefined-outer-name

import hashlib
import logging
import os
from pathlib import Path
Expand All @@ -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
Expand Down Expand Up @@ -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)
Expand Down

0 comments on commit 93cebb5

Please sign in to comment.