test: build diracx containers from source in integration tests

Replace --diracx-dist-dir with --diracx-src-dir which uses
docker-compose build instead of injecting wheels via the entrypoint.
Also fix stale /opt/conda and micromamba references from the old
container images.

Author: chrisburr

docs/source/DeveloperGuide/CodeTesting/index.rst

@@ -360,13 +360,11 @@ To deactivate a service from being used with DiracX, you can add it in `integrat
       "WorkloadManagement/JobMonitoring",
     ]
 
-By setting `TEST_DIRACX=Yes` only, it will take the last version of DiracX by default. If you want to provide your own, you have to build your DiracX project, and provide the `dist` folder path when calling `prepare-client`. This path has to be absolute.
+By setting `TEST_DIRACX=Yes` only, it will take the last version of DiracX by default. If you want to test against a local DiracX checkout, provide the source directory path when calling `prepare-environment`. This will build the DiracX container images from source and build wheels for the DIRAC containers.
 
 .. code-block:: bash
 
-    ./integration-tests.py prepare-client TEST_DIRACX=Yes --diracx-dist-dir my-dist-folder/
-
-It will then mount your dist folder into DIRAC and DiracX (in `/diracx_sources`) to install the right dependencies.
+    ./integration-tests.py prepare-environment TEST_DIRACX=Yes --diracx-src-dir /path/to/diracx/
 
 For MacOS, there are two bugs that can be fixed.
 

integration_tests.py

@@ -175,14 +175,14 @@ def create(
     flags: Optional[list[str]] = typer.Argument(None),
     editable: Optional[bool] = None,
     extra_module: Optional[list[str]] = None,
-    diracx_dist_dir: Optional[str] = None,
+    diracx_src_dir: Optional[str] = None,
     release_var: Optional[str] = None,
     run_server_tests: bool = True,
     run_client_tests: bool = True,
     run_pilot_tests: bool = True,
 ):
     """Start a local instance of the integration tests"""
-    prepare_environment(flags, editable, extra_module, diracx_dist_dir, release_var)
+    prepare_environment(flags, editable, extra_module, diracx_src_dir, release_var)
     install_server()
     install_client()
     install_pilot()
@@ -230,7 +230,7 @@ def prepare_environment(
     flags: Optional[list[str]] = typer.Argument(None),
     editable: Optional[bool] = None,
     extra_module: Optional[list[str]] = None,
-    diracx_dist_dir: Optional[str] = None,
+    diracx_src_dir: Optional[str] = None,
     release_var: Optional[str] = None,
 ):
     """Prepare the local environment for installing DIRAC."""
@@ -277,7 +277,7 @@ def prepare_environment(
     extra_services = list(chain(*[config["extra-services"] for config in module_configs.values()]))
 
     typer.secho("Running docker compose to create containers", fg=c.GREEN)
-    with _gen_docker_compose(modules, diracx_dist_dir=diracx_dist_dir) as docker_compose_fn:
+    with _gen_docker_compose(modules, diracx_src_dir=diracx_src_dir) as docker_compose_fn:
         subprocess.run(
             [*DOCKER_COMPOSE_CMD, "-f", docker_compose_fn, "up", "-d", "dirac-server", "dirac-client", "dirac-pilot"]
             + extra_services,
@@ -374,7 +374,7 @@ def prepare_environment(
     typer.secho("Running docker compose to create DiracX containers", fg=c.GREEN)
     typer.secho(f"Will leave a folder behind: {docker_compose_fn_final}", fg=c.YELLOW)
 
-    with _gen_docker_compose(modules, diracx_dist_dir=diracx_dist_dir) as docker_compose_fn:
+    with _gen_docker_compose(modules, diracx_src_dir=diracx_src_dir) as docker_compose_fn:
         # We cannot use the temporary directory created in the context manager because
         # we don't stay in the contect manager (Popen)
         # So we need something that outlives it.
@@ -591,7 +591,7 @@ class TestExit(typer.Exit):
 
 
 @contextmanager
-def _gen_docker_compose(modules, *, diracx_dist_dir=None):
+def _gen_docker_compose(modules, *, diracx_src_dir=None):
     # 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())
@@ -607,23 +607,50 @@ def _gen_docker_compose(modules, *, diracx_dist_dir=None):
     docker_compose["services"]["diracx-wait-for-db"]["volumes"].extend(volumes[:])
 
     module_configs = _load_module_configs(modules)
-    if diracx_dist_dir is not None:
-        for container_name in [
-            "dirac-client",
-            "dirac-pilot",
-            "dirac-server",
-            "diracx-init-cs",
-            "diracx-wait-for-db",
-            "diracx-init-db",
-            "diracx",
-        ]:
+    if diracx_src_dir is not None:
+        diracx_src_dir = str(Path(diracx_src_dir).absolute())
+
+        # Build wheels from the diracx source for the DIRAC containers
+        diracx_wheel_dir = Path(tempfile.mkdtemp(prefix="diracx-wheels-"))
+        typer.secho(f"Building diracx wheels in {diracx_wheel_dir}", fg=c.GREEN)
+        subprocess.run(
+            [
+                sys.executable,
+                "-m",
+                "pip",
+                "wheel",
+                "--no-deps",
+                f"--wheel-dir={diracx_wheel_dir}",
+                *[f"{diracx_src_dir}/diracx-{pkg}" for pkg in ["core", "client", "cli"]],
+            ],
+            check=True,
+        )
+
+        # Mount wheels into DIRAC containers so installDIRACX can find them
+        for container_name in ["dirac-client", "dirac-pilot", "dirac-server"]:
             docker_compose["services"][container_name].setdefault("volumes", []).append(
-                f"{diracx_dist_dir}:/diracx_sources"
+                f"{diracx_wheel_dir}:/diracx_sources"
             )
             docker_compose["services"][container_name].setdefault("environment", []).append(
                 "DIRACX_CUSTOM_SOURCE_PREFIXES=/diracx_sources"
             )
 
+        # Build diracx container images from source instead of pulling pre-built ones
+        diracx_build_services = {
+            "container-services": ["diracx", "diracx-init-keystore", "diracx-init-db"],
+            "container-client": ["diracx-init-cs"],
+        }
+        for pixi_env, container_names in diracx_build_services.items():
+            for container_name in container_names:
+                service = docker_compose["services"][container_name]
+                del service["image"]
+                service.pop("pull_policy", None)
+                service["build"] = {
+                    "context": diracx_src_dir,
+                    "dockerfile": "containers/Dockerfile",
+                    "args": {"PIXI_ENV": pixi_env},
+                }
+
     # Add any extension services
     for module_name, module_configs in module_configs.items():
         for service_name, service_config in module_configs["extra-services"].items():

tests/CI/docker-compose.yml

@@ -255,7 +255,14 @@ services:
     environment:
       - DIRACX_DB_URL_AUTHDB=mysql+aiomysql://Dirac:Dirac@mysql/DiracXAuthDB
     entrypoint: |
-      /entrypoint.sh bash -xc 'micromamba install --yes -c conda-forge mysql-client && mysql -h mysql -u root --password=password -e "CREATE DATABASE DiracXAuthDB" && mysql -h mysql -u root --password=password -e "GRANT SELECT,INSERT,LOCK TABLES,UPDATE,DELETE,CREATE,DROP,ALTER,REFERENCES,CREATE VIEW,SHOW VIEW,INDEX,TRIGGER,ALTER ROUTINE,CREATE ROUTINE ON DiracXAuthDB.* TO Dirac@'"'"'%'"'"'" && python -m diracx.db init-sql && python -m diracx.db init-os'
+      /entrypoint.sh bash -xc 'python -c "
+      import pymysql
+      db = pymysql.connect(host=\"mysql\", user=\"root\", password=\"password\")
+      c = db.cursor()
+      c.execute(\"CREATE DATABASE DiracXAuthDB\")
+      c.execute(\"GRANT SELECT,INSERT,LOCK TABLES,UPDATE,DELETE,CREATE,DROP,ALTER,REFERENCES,CREATE VIEW,SHOW VIEW,INDEX,TRIGGER,ALTER ROUTINE,CREATE ROUTINE ON DiracXAuthDB.* TO Dirac@\\\"%%\\\"\")
+      db.commit()
+      " && python -m diracx.db init-sql && python -m diracx.db init-os'
     pull_policy: always
 
   diracx:
@@ -300,7 +307,7 @@ services:
       /entrypoint.sh bash -xc 'uvicorn --factory diracx.routers:create_app --host=0.0.0.0'
 
     healthcheck:
-      test: ["CMD", "/opt/conda/bin/python", "-c", 'import requests; requests.get("http://localhost:8000/.well-known/openid-configuration").raise_for_status()']
+      test: ["CMD", "python", "-c", 'import requests; requests.get("http://localhost:8000/.well-known/openid-configuration").raise_for_status()']
       interval: 5s
       timeout: 2s
       retries: 15