Changes for OpenSearch end-to-end tests

config/end_to_end/extract_and_output.Dockerfile

@@ -24,6 +24,8 @@ RUN git clone $GIT_REPOSITORY
 
 # Install Plaso dependencies.
 WORKDIR /home/test/plaso
+
+# Install Plaso and dependencies.
 RUN ./config/linux/ubuntu_install_plaso.sh
 
 # Configure container for running Plaso.

config/jenkins/greendale/output_opensearch.ini

@@ -1,5 +1,5 @@
 [output_opensearch]
-case=output
+case=analyze_and_output
 output_file=studentpc1.csv
 output_format=opensearch
 output_options=--opensearch_mappings=plaso/data/opensearch.mappings

config/jenkins/greendale/output_opensearch_ts.ini

@@ -1,5 +1,6 @@
 [output_opensearch_ts]
-case=output
+case=analyze_and_output
 output_file=studentpc1.csv
 output_format=opensearch_ts
+output_options=--opensearch_mappings=plaso/data/opensearch.mappings
 source=studentpc1.plaso

config/jenkins/greendale/psort-studentpc1-nsrlsvr.ini

@@ -1,6 +1,6 @@
 [nsrlsvr]
-case=output
+case=analyze_and_output
+analysis_options=--analysis nsrlsvr --nsrlsvr-port=9120
 source=studentpc1.plaso
-output_options=--analysis nsrlsvr --nsrlsvr-port=9120
 output_file=studentpc1.csv
 output_format=dynamic

config/jenkins/greendale/psort-studentpc1-sessionize-unique-domains.ini

@@ -1,6 +1,6 @@
 [sessionize-unique-domains]
-case=output
+case=analyze_and_output
+analysis_options=--analysis sessionize,unique_domains_visited
 source=studentpc1.plaso
-output_options=--analysis sessionize,unique_domains_visited
 output_file=studentpc1.csv
 output_format=dynamic

config/jenkins/greendale/psort-studentpc1-tagging.ini

@@ -1,6 +1,6 @@
 [tagging]
-case=output
+case=analyze_and_output
+analysis_options=--analysis tagging --tagging-file=plaso/data/tag_windows.txt
 source=studentpc1.plaso
-output_options=--analysis=tagging --tagging-file=plaso/data/tag_windows.txt
 output_file=studentpc1.csv
 output_format=dynamic

config/jenkins/run_end_to_end_tests.sh

@@ -26,9 +26,11 @@ RESULTS_DIRECTORY="${PWD}/plaso-out";
 
 mkdir -p "${RESULTS_DIRECTORY}/profiling";
 
-# Build the extract_and_output end-to-end test Docker image.
+# Build the end-to-end test Docker image.
 docker build -f extract_and_output.Dockerfile --force-rm --no-cache -t log2timeline/plaso . ;
 
 docker run log2timeline/plaso ./utils/check_dependencies.py;
 
-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 "./tests/end-to-end.py --config /config/${CONFIGURATION_NAME}.ini --references-directory test_data/end_to_end --results-directory /home/test/plaso/plaso-out --sources-directory /sources --scripts-directory plaso/scripts"
+COMMAND="./tests/end-to-end.py --config /config/${CONFIGURATION_NAME}.ini --references-directory test_data/end_to_end --results-directory /home/test/plaso/plaso-out --sources-directory /sources --scripts-directory plaso/scripts";
+
+docker run --name plaso -p 9200:9200 -p 9600:9600 -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}"