test: bumping versions

DIRACGrid · Mar 14, 2024 · bc9164a · bc9164a
1 parent fc3332f
commit bc9164a
Show file tree

Hide file tree

Showing 6 changed files with 10 additions and 15 deletions.
diff --git 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
@@ -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
@@ -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
diff --git a/...vs/opensearchproject/opensearch:2.1.0.env → ...s/opensearchproject/opensearch:2.11.1.env b/...vs/opensearchproject/opensearch:2.1.0.env → ...s/opensearchproject/opensearch:2.11.1.env
diff --git 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