From bc9164a59133a9e968910a655e8eedd6ad5709b7 Mon Sep 17 00:00:00 2001
From: Federico Stagni <federico.stagni@cern.ch>
Date: Thu, 14 Mar 2024 13:40:37 +0100
Subject: [PATCH] test: bumping versions

---
 .github/workflows/integration.yml                         | 4 ++--
 integration_tests.py                                      | 8 ++++----
 tests/CI/docker-compose.yml                               | 3 +++
 tests/CI/envs/elasticsearch:6.6.0.env                     | 8 --------
 .../{opensearch:2.1.0.env => opensearch:2.11.1.env}       | 0
 tests/Jenkins/utilities.sh                                | 2 +-
 6 files changed, 10 insertions(+), 15 deletions(-)
 delete mode 100644 tests/CI/envs/elasticsearch:6.6.0.env
 rename tests/CI/envs/opensearchproject/{opensearch:2.1.0.env => opensearch:2.11.1.env} (100%)

diff --git a/.github/workflows/integration.yml b/.github/workflows/integration.yml
index 2bf15f87a80..7a67d68d4c3 100644
--- a/.github/workflows/integration.yml
+++ b/.github/workflows/integration.yml
@@ -31,8 +31,8 @@ jobs:
       matrix:
         # TEST_NAME is a dummy variable used to make it easier to read the web interface
         include:
-          - TEST_NAME: "MariaDB 10.6, elasticsearch:7.9.1"
-            ARGS: MYSQL_VER=mariadb:10.6.3 ES_VER=elasticsearch:7.9.1
+          - TEST_NAME: "MariaDB 10.6, elasticsearch:7.9.1, cc7"
+            ARGS: MYSQL_VER=mariadb:10.6.3 ES_VER=elasticsearch:7.9.1 HOST_OS=cc7
           - TEST_NAME: "DIPS"
             ARGS: TEST_HTTPS=No
           - TEST_NAME: "Force DEncode"
diff --git a/integration_tests.py b/integration_tests.py
index 3f4f8851da7..428799c7639 100755
--- a/integration_tests.py
+++ b/integration_tests.py
@@ -22,9 +22,9 @@
 from typer import colors as c
 
 # Editable configuration
-DEFAULT_HOST_OS = "cc7"
-DEFAULT_MYSQL_VER = "mysql:8.0"
-DEFAULT_ES_VER = "opensearchproject/opensearch:2.1.0"
+DEFAULT_HOST_OS = "el9"
+DEFAULT_MYSQL_VER = "mysql:8.0.36"
+DEFAULT_ES_VER = "opensearchproject/opensearch:2.11.1"
 DEFAULT_IAM_VER = "indigoiam/iam-login-service:v1.8.0"
 FEATURE_VARIABLES = {
     "DIRACOSVER": "master",
@@ -245,7 +245,7 @@ def prepare_environment(
         uid = str(os.getuid())
         ret = subprocess.run(cmd + ["groupadd", "--gid", gid, "dirac"], check=False)
         if ret.returncode != 0:
-            typer.secho(f"Failed to add add group dirac with id={gid}", fg=c.YELLOW)
+            typer.secho(f"Failed to add group dirac with id={gid}", fg=c.YELLOW)
         subprocess.run(
             cmd
             + [
diff --git a/tests/CI/docker-compose.yml b/tests/CI/docker-compose.yml
index 5ae874ac279..529b7342882 100644
--- a/tests/CI/docker-compose.yml
+++ b/tests/CI/docker-compose.yml
@@ -101,6 +101,8 @@ services:
       - DIRACX_CONFIG_BACKEND_URL=git+file:///cs_store/initialRepo
       - DIRACX_SERVICE_AUTH_TOKEN_KEY=file:///signing-key/rs256.key
     pull_policy: always
+    command: ["sleep", "infinity"]
+
 
   dirac-client:
     image: ${CI_REGISTRY_IMAGE}/${HOST_OS}-dirac
@@ -112,6 +114,7 @@ services:
     ulimits:
       nofile: 8192
     pull_policy: always
+    command: ["sleep", "infinity"]
 
   diracx-init-key:
     image: ghcr.io/diracgrid/diracx/secret-generation:latest
diff --git a/tests/CI/envs/elasticsearch:6.6.0.env b/tests/CI/envs/elasticsearch:6.6.0.env
deleted file mode 100644
index fe4bd21560b..00000000000
--- a/tests/CI/envs/elasticsearch:6.6.0.env
+++ /dev/null
@@ -1,8 +0,0 @@
-discovery.type=single-node
-cluster.routing.allocation.disk.threshold_enabled=true
-cluster.routing.allocation.disk.watermark.flood_stage=200mb
-cluster.routing.allocation.disk.watermark.low=500mb
-cluster.routing.allocation.disk.watermark.high=300mb
-# Elasticsearch allocates 1GB of memory by default. As resources are limited
-# and elasticsearch performance isn't critical in CI, limit this to 256MB
-"ES_JAVA_OPTS=-Xms256m -Xmx256m"
diff --git a/tests/CI/envs/opensearchproject/opensearch:2.1.0.env b/tests/CI/envs/opensearchproject/opensearch:2.11.1.env
similarity index 100%
rename from tests/CI/envs/opensearchproject/opensearch:2.1.0.env
rename to tests/CI/envs/opensearchproject/opensearch:2.11.1.env
diff --git a/tests/Jenkins/utilities.sh b/tests/Jenkins/utilities.sh
index 0bdc264b748..b44e99093b9 100644
--- a/tests/Jenkins/utilities.sh
+++ b/tests/Jenkins/utilities.sh
@@ -125,7 +125,7 @@ findServices(){
     ServicestoExclude=' '
   fi
 
-  if ! cd "${SERVERINSTALLDIR}" -ne 0; then
+  if ! cd "${SERVERINSTALLDIR}"; then
     echo 'ERROR: cannot change to ' "${SERVERINSTALLDIR}" >&2
     exit 1
   fi