From 6b1488dacb46c52a969ac58b94b078d1631258a1 Mon Sep 17 00:00:00 2001 From: Joachim Metz Date: Mon, 1 Apr 2024 08:06:02 +0200 Subject: [PATCH] Changes for OpenSearch end-to-end tests --- config/end_to_end/output_opensearch.Dockerfile | 2 +- config/jenkins/run_end_to_end_tests.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/config/end_to_end/output_opensearch.Dockerfile b/config/end_to_end/output_opensearch.Dockerfile index 580f1d2c04..4e979e12ee 100644 --- a/config/end_to_end/output_opensearch.Dockerfile +++ b/config/end_to_end/output_opensearch.Dockerfile @@ -11,7 +11,7 @@ ENV DEBIAN_FRONTEND=noninteractive RUN apt-get -y update && \ apt-get -y install apt-transport-https apt-utils && \ apt-get -y install libterm-readline-gnu-perl software-properties-common && \ - apt-get -y install locales git openjdk-23-jre sudo wget + apt-get -y install locales git sudo wget # Set terminal to UTF-8 by default. RUN locale-gen en_US.UTF-8 diff --git a/config/jenkins/run_end_to_end_tests.sh b/config/jenkins/run_end_to_end_tests.sh index 2723fcc1c8..b60c090cca 100755 --- a/config/jenkins/run_end_to_end_tests.sh +++ b/config/jenkins/run_end_to_end_tests.sh @@ -40,7 +40,7 @@ COMMAND="./tests/end-to-end.py --config /config/${CONFIGURATION_NAME}.ini --refe if test "${CONFIGURATION_NAME}" = "output_opensearch"; then - COMMAND="(cd /home/test/opensearch && su -c 'export OPENSEARCH_INITIAL_ADMIN_PASSWORD=Tempor@ryf0rT3st; ./opensearch-tar-install.sh -Eplugins.security.disabled=true' opensearch &); sleep 180; ${COMMAND}"; + COMMAND="(cd /home/test/opensearch && su -c 'export JAVA_HOME=/home/test/opensearch/jdk; export OPENSEARCH_INITIAL_ADMIN_PASSWORD=Tempor@ryf0rT3st; ./opensearch-tar-install.sh -Eplugins.security.disabled=true' opensearch &); sleep 180; ${COMMAND}"; fi docker run -v "${CONFIGURATION_DIRECTORY}:/config:z" -v "${RESULTS_DIRECTORY}:/home/test/plaso/plaso-out:z" -v "${SOURCES_DIRECTORY}:/sources:z" log2timeline/plaso /bin/bash -c "${COMMAND}"