feat: Add in CI new legacy adapted services.

Author: Robin VAN DE MERGHEL

.github/workflows/integration.yml

@@ -57,9 +57,14 @@ jobs:
             requests \
             typer
     - name: Prepare environment
-      run: ./integration_tests.py prepare-environment ${{ matrix.ARGS }}
+      run: |
+        ./integration_tests.py prepare-environment ${{ matrix.ARGS }} \
+          --legacy-adapted-services WorkloadManagement/JobMonitoring \
+          --legacy-adapted-services WorkloadManagement/JobStateUpdate
     - name: Install server
       run: ./integration_tests.py install-server
+    - name: Get legacy adaptors
+      run: ./integration_tests.py list-legacy-adapted-services
     - name: Install client
       run: ./integration_tests.py install-client
     - name: Install pilot

integration_tests.py

@@ -538,6 +538,15 @@ def list_services():
         typer.secho(f"* {service}", err=True)
 
 
+@app.command()
+def list_legacy_adapted_services():
+    """List the services which are adapted with legacy adaptor."""
+    _check_containers_running()
+    typer.secho("Known legacy adapted services:", err=True)
+    for service in _list_legacy_adaptedservices()[1]:
+        typer.secho(f"* {service}", err=True)
+
+
 @app.command()
 def runsvctrl(command: str, pattern: str):
     """Execute runsvctrl inside the server container."""
@@ -1259,6 +1268,28 @@ def _list_services():
         raise typer.Exit(1)
 
 
+def _list_legacy_adaptedservices():
+    # Code to get the CFG, and extract the legacy adapted services
+    # The Python 3 runit dir ends up in /diracos
+    for runit_dir in ["ServerInstallDIR/runit", "ServerInstallDIR/diracos/runit"]:
+        cmd = _build_docker_cmd("server")
+        cmd += [
+            "bash",
+            "-c",
+            f". $HOME/CONFIG && "
+            ". $HOME/ServerInstallDIR/bashrc && "
+            "python $HOME/LocalRepo/TestCode/DIRAC/tests/Integration/dirac-cfg-get-legacy-adapted-services.py",
+        ]
+        ret = subprocess.run(cmd, check=False, stdout=subprocess.PIPE, text=True)
+        if not ret.returncode:
+            return runit_dir, ret.stdout.split()
+    else:
+        typer.secho("Failed to find list of adapted services", err=True, fg=c.RED)
+        typer.secho(f"stdout was: {ret.stdout!r}", err=True)
+        typer.secho(f"stderr was: {ret.stderr!r}", err=True)
+        raise typer.Exit(1)
+
+
 def _log_popen_stdout(p):
     while p.poll() is None:
         line = p.stdout.readline().rstrip()

tests/Integration/dirac-cfg-get-legacy-adapted-services.py

@@ -0,0 +1,10 @@
+from diraccfg import CFG
+
+# Get the file
+cfg = CFG().loadFromFile("/home/dirac/ServerInstallDIR/etc/Production.cfg")
+
+# Read it
+diracx = cfg.getAsDict("DiracX") or {}
+# Extract the legacy enabled clients
+legacy_enabled = diracx.get("LegacyClientEnabled", None)
+print(legacy_enabled)