From c63022ad1f2ca40508079b98c1377e49cfe11b10 Mon Sep 17 00:00:00 2001
From: Maximilian Linhoff <maximilian.linhoff@cta-observatory.org>
Date: Thu, 2 Apr 2026 16:01:32 +0200
Subject: [PATCH 1/3] fix(tests): Replace removed egg syntax with dependency
 links

(cherry picked from commit 469fa56a22b6716144f4303ea7355e97714f3663)
---
 tests/Jenkins/utilities.sh | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/tests/Jenkins/utilities.sh b/tests/Jenkins/utilities.sh
index c25f4e0dfaf..535df210475 100644
--- a/tests/Jenkins/utilities.sh
+++ b/tests/Jenkins/utilities.sh
@@ -255,8 +255,9 @@ installDIRAC() {
 
   if [[ -n "${INSTALLATION_BRANCH}" ]]; then
     # Use this for (e.g.) running backward-compatibility tests
-    echo "pip-installing DIRAC from git+https://github.com/DIRACGrid/DIRAC.git@${INSTALLATION_BRANCH}#egg=DIRAC[client]"
-    pip install "git+https://github.com/DIRACGrid/DIRAC.git@${INSTALLATION_BRANCH}#egg=DIRAC[client]"
+    dirac_spec="DIRAC[client] @ git+https://github.com/DIRACGrid/DIRAC.git@${INSTALLATION_BRANCH}"
+    echo "pip-installing DIRAC from $dirac_spec"
+    pip install "$dirac_spec"
   else
     for module_path in "${ALTERNATIVE_MODULES[@]}"; do
       pip install ${PIP_INSTALL_EXTRA_ARGS:-} "${module_path}"

From b2d561e34bc1ca87d15043c51a2058e9bb5d9597 Mon Sep 17 00:00:00 2001
From: Chris Burr <christopher.burr@cern.ch>
Date: Tue, 7 Apr 2026 11:40:17 +0200
Subject: [PATCH 2/3] chore: dump container logs when docker compose up fails

---
 integration_tests.py | 27 ++++++++++++++++++++++-----
 1 file changed, 22 insertions(+), 5 deletions(-)

diff --git a/integration_tests.py b/integration_tests.py
index 213bf376886..34961ac080d 100755
--- a/integration_tests.py
+++ b/integration_tests.py
@@ -228,11 +228,28 @@ def prepare_environment(
 
     typer.secho("Running docker-compose to create containers", fg=c.GREEN)
     with _gen_docker_compose(modules) as docker_compose_fn:
-        subprocess.run(
-            ["docker", "compose", "-f", docker_compose_fn, "up", "-d"],
-            check=True,
-            env=docker_compose_env,
-        )
+        try:
+            subprocess.run(
+                ["docker", "compose", "-f", docker_compose_fn, "up", "-d"],
+                check=True,
+                env=docker_compose_env,
+            )
+        except subprocess.CalledProcessError:
+            typer.secho(
+                "docker compose up failed, dumping container logs for diagnosis",
+                fg=c.RED,
+            )
+            subprocess.run(
+                ["docker", "compose", "-f", docker_compose_fn, "ps", "-a"],
+                check=False,
+                env=docker_compose_env,
+            )
+            subprocess.run(
+                ["docker", "compose", "-f", docker_compose_fn, "logs", "--no-color"],
+                check=False,
+                env=docker_compose_env,
+            )
+            raise
 
     typer.secho("Creating users in server and client containers", fg=c.GREEN)
     for container_name in ["server", "client"]:

From 068e1ab160cd046f9fc6251b32c66ece35f1e25e Mon Sep 17 00:00:00 2001
From: Chris Burr <christopher.burr@cern.ch>
Date: Tue, 7 Apr 2026 11:48:07 +0200
Subject: [PATCH 3/3] fix(tests): disable JVM container support for opensearch
 2.1.0

Works around a JDK cgroup v2 NPE in ProcessProbe <clinit> that crashes
opensearch 2.1.0 on GitHub runners using cgroup v2.
---
 tests/CI/envs/opensearchproject/opensearch:2.1.0.env | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/tests/CI/envs/opensearchproject/opensearch:2.1.0.env b/tests/CI/envs/opensearchproject/opensearch:2.1.0.env
index 533442a1d01..5fac49aa91e 100644
--- a/tests/CI/envs/opensearchproject/opensearch:2.1.0.env
+++ b/tests/CI/envs/opensearchproject/opensearch:2.1.0.env
@@ -6,4 +6,6 @@ cluster.routing.allocation.disk.watermark.high=300mb
 plugins.security.disabled=true
 # Elasticsearch allocates 1GB of memory by default. As resources are limited
 # and elasticsearch performance isn't critical in CI, limit this to 256MB
-OPENSEARCH_JAVA_OPTS="-Xms256m -Xmx256m" # minimum and maximum Java heap size
+# -XX:-UseContainerSupport works around a JDK cgroup v2 NPE in OpenSearch 2.1.0
+# (ProcessProbe <clinit> crashes on newer GitHub runners with cgroup v2)
+OPENSEARCH_JAVA_OPTS="-Xms256m -Xmx256m -XX:-UseContainerSupport"