diff --git a/.github/workflows/integration.yml b/.github/workflows/integration.yml index 97ba45fd339..bf4a50f24af 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 11.4, elasticsearch:7.9.1" + ARGS: MYSQL_VER=mariadb:11.4.3 ES_VER=elasticsearch:7.9.1 - TEST_NAME: "DIPS" ARGS: TEST_HTTPS=No - TEST_NAME: "Force DEncode" diff --git a/integration_tests.py b/integration_tests.py index 64f9144c8c4..30a8da5580a 100755 --- a/integration_tests.py +++ b/integration_tests.py @@ -23,8 +23,8 @@ # Editable configuration DEFAULT_HOST_OS = "el9" -DEFAULT_MYSQL_VER = "mysql:8.0.36" -DEFAULT_ES_VER = "opensearchproject/opensearch:2.11.1" +DEFAULT_MYSQL_VER = "mysql:8.0.40" +DEFAULT_ES_VER = "opensearchproject/opensearch:2.18.0" DEFAULT_IAM_VER = "indigoiam/iam-login-service:v1.8.0" FEATURE_VARIABLES = { "DIRACOSVER": "master", diff --git a/tests/CI/envs/opensearchproject/opensearch:2.11.1.env b/tests/CI/envs/opensearchproject/opensearch:2.18.0.env similarity index 90% rename from tests/CI/envs/opensearchproject/opensearch:2.11.1.env rename to tests/CI/envs/opensearchproject/opensearch:2.18.0.env index 0eb9691f87f..1d03b44f366 100644 --- a/tests/CI/envs/opensearchproject/opensearch:2.11.1.env +++ b/tests/CI/envs/opensearchproject/opensearch:2.18.0.env @@ -7,3 +7,4 @@ 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 +OPENSEARCH_INITIAL_ADMIN_PASSWORD=This_password1#