Merge pull request #8076 from fstagni/80_use_containerized_certs_creation_simple

[8.0] integration test fixes (actually mounting volumes)

Author: fstagni

integration_tests.py

@@ -181,7 +181,7 @@ def destroy():
     with _gen_docker_compose(DEFAULT_MODULES) as docker_compose_fn:
         os.execvpe(
             "docker",
-            ["docker", "compose", "-f", docker_compose_fn, "down", "--remove-orphans", "-t", "0"],
+            ["docker", "compose", "-f", docker_compose_fn, "down", "--remove-orphans", "-t", "0", "--volumes"],
             _make_env({}),
         )
 
@@ -510,16 +510,21 @@ class TestExit(typer.Exit):
 
 @contextmanager
 def _gen_docker_compose(modules):
-    # Load the docker-compose configuration and mount the necessary volumes
+    # Load the docker compose configuration and mount the necessary volumes
     input_fn = Path(__file__).parent / "tests/CI/docker-compose.yml"
     docker_compose = yaml.safe_load(input_fn.read_text())
+    for ctn in ("dirac-server", "dirac-client"):
+        if "volumes" not in docker_compose["services"][ctn]:
+            docker_compose["services"][ctn]["volumes"] = []
     volumes = [f"{path}:/home/dirac/LocalRepo/ALTERNATIVE_MODULES/{name}" for name, path in modules.items()]
     volumes += [f"{path}:/home/dirac/LocalRepo/TestCode/{name}" for name, path in modules.items()]
-    docker_compose["services"]["dirac-server"]["volumes"] = volumes[:]
-    docker_compose["services"]["dirac-client"]["volumes"] = volumes[:]
+    docker_compose["services"]["dirac-server"]["volumes"].extend(volumes[:])
+    docker_compose["services"]["dirac-client"]["volumes"].extend(volumes[:])
+
+    module_configs = _load_module_configs(modules)
 
     # Add any extension services
-    for module_name, module_configs in _load_module_configs(modules).items():
+    for module_name, module_configs in module_configs.items():
         for service_name, service_config in module_configs["extra-services"].items():
             typer.secho(f"Adding service {service_name} for {module_name}", err=True, fg=c.GREEN)
             docker_compose["services"][service_name] = service_config.copy()

tests/CI/docker-compose.yml

@@ -1,4 +1,6 @@
 volumes:
+  # Volume used to store the certificates of dirac
+  certs_data:
   # Volume used to store the jwks of the IAM service
   diracx-iam-key-store:
 
@@ -88,6 +90,15 @@ services:
       - debug=true
     pull_policy: always
 
+  dirac-init-certificates:
+    image: ghcr.io/diracgrid/management/certificates-generation:latest
+    container_name: dirac-init-certificates
+    volumes:
+      - certs_data:/ca/certs/
+    entrypoint: |
+      /entrypoint.sh
+    pull_policy: always
+
   dirac-server:
     image: ${CI_REGISTRY_IMAGE}/${HOST_OS}-dirac
     container_name: server
@@ -98,8 +109,12 @@ services:
         condition: service_healthy
       elasticsearch:
         condition: service_healthy
+      dirac-init-certificates:
+        condition: service_completed_successfully # Let the init container create the certificates
     ulimits:
       nofile: 8192
+    volumes:
+      - certs_data:/ca/certs
     pull_policy: always
     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.
 
@@ -111,6 +126,8 @@ services:
     user: "${DIRAC_UID}:${DIRAC_GID}"
     depends_on:
       - dirac-server
+    volumes:
+      - certs_data:/ca/certs
     ulimits:
       nofile: 8192
     pull_policy: always

tests/Jenkins/utilities.sh

@@ -266,6 +266,11 @@ installDIRAC() {
   echo "$DIRAC"
   echo "$PATH"
 
+  if ! dirac-proxy-init -g dirac_admin --nocs --no-upload -C "${SERVERINSTALLDIR}/user/client.pem" -K "${SERVERINSTALLDIR}/user/client.key" "${DEBUG}"; then
+    echo 'ERROR: dirac-proxy-init --nocs --no-upload failed' >&2
+    exit 1
+  fi
+
   # now configuring
   cmd="dirac-configure -S ${DIRACSETUP} -C ${CSURL} --SkipCAChecks ${CONFIGUREOPTIONS} ${DEBUG}"
   if ! bash -c "${cmd}"; then