From e1c866f23b3aba23edbcfd45fa7e5285decf5428 Mon Sep 17 00:00:00 2001
From: Joachim Metz <joachim.metz@gmail.com>
Date: Mon, 1 Apr 2024 07:28:21 +0200
Subject: [PATCH] Changes for OpenSearch end-to-end tests

---
 config/end_to_end/output_opensearch.Dockerfile | 1 -
 config/jenkins/run_end_to_end_tests.sh         | 2 +-
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/config/end_to_end/output_opensearch.Dockerfile b/config/end_to_end/output_opensearch.Dockerfile
index 5f627e92fd..580f1d2c04 100644
--- a/config/end_to_end/output_opensearch.Dockerfile
+++ b/config/end_to_end/output_opensearch.Dockerfile
@@ -5,7 +5,6 @@ ARG GIT_REPOSITORY=https://github.com/log2timeline/plaso.git
 ARG OPENSEARCH_VERSION=2.12.0
 
 ENV DEBIAN_FRONTEND=noninteractive
-ENV OPENSEARCH_INITIAL_ADMIN_PASSWORD="Tempor@ryf0rT3st"
 
 # Combining the apt-get commands into a single run reduces the size of the resulting image.
 # The apt-get installations below are interdependent and need to be done in sequence.
diff --git a/config/jenkins/run_end_to_end_tests.sh b/config/jenkins/run_end_to_end_tests.sh
index c8b310fc7d..155703189f 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 './opensearch-tar-install.sh -Eplugins.security.disabled=true' opensearch &); sleep 180; ${COMMAND}";
+	COMMAND="(cd /home/test/opensearch && su -c '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}"