From f21d3e210e96b06027fab445b202b0e786bb1bbd Mon Sep 17 00:00:00 2001 From: Federico Stagni Date: Wed, 13 Nov 2024 11:56:36 +0100 Subject: [PATCH] test: added a health check for CVMFS dir --- integration_tests.py | 5 ++--- tests/CI/docker-compose.yml | 13 +++++++++++-- 2 files changed, 13 insertions(+), 5 deletions(-) diff --git a/integration_tests.py b/integration_tests.py index 64f9144c8c4..fd5a4699c02 100755 --- a/integration_tests.py +++ b/integration_tests.py @@ -780,9 +780,8 @@ def _make_env(flags): env["ES_VER"] = flags.pop("ES_VER", DEFAULT_ES_VER) env["IAM_VER"] = flags.pop("IAM_VER", DEFAULT_IAM_VER) if "CVMFS_DIR" not in env or not Path(env["CVMFS_DIR"]).is_dir(): - # create a directory in tmp - with tempfile.TemporaryDirectory() as tmpdir: - env["CVMFS_DIR"] = tmpdir + typer.secho(f"CVMFS_DIR environment value: {env.get('CVMFS_DIR', 'NOT SET')}", fg=c.YELLOW) + env["CVMFS_DIR"] = "/tmp" return env diff --git a/tests/CI/docker-compose.yml b/tests/CI/docker-compose.yml index 472da21809a..17f70b10d32 100644 --- a/tests/CI/docker-compose.yml +++ b/tests/CI/docker-compose.yml @@ -115,17 +115,26 @@ services: command: ["sleep", "infinity"] # This is necessary because of the issue described in https://github.com/moby/moby/issues/42275. What is added here is a hack/workaround. dirac-pilot: - image: registry.cern.ch/cernvm/five/cernvm-five + image: ${CI_REGISTRY_IMAGE}/${HOST_OS}-dirac container_name: pilot hostname: pilot user: "${DIRAC_UID}:${DIRAC_GID}" depends_on: - dirac-server volumes: - - ${CVMFS_DIR}:/cvmfs:ro + - type: bind + source: ${CVMFS_DIR} + target: /cvmfs + bind: + propagation: rslave ulimits: nofile: 8192 pull_policy: always + healthcheck: + test: ["CMD", "ls", "${CVMFS_DIR}"] + timeout: 20s + retries: 10 + start_period: 60s command: ["sleep", "infinity"] # This is necessary because of the issue described in https://github.com/moby/moby/issues/42275. What is added here is a hack/workaround. diracx-init-key: