Skip to content

[9.0] test: added a health check for CVMFS dir #7885

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
fstagni merged 1 commit into from
Nov 19, 2024
Merged

[9.0] test: added a health check for CVMFS dir #7885

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 2 additions & 3 deletions integration_tests.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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


Expand Down
13 changes: 11 additions & 2 deletions tests/CI/docker-compose.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down