jjb: Add new benchmark testcase using lttng-test-filter module

[lttng-ci.git] / scripts / lttng-baremetal-tests / run-baremetal-benchmarks.sh

diff --git a/scripts/lttng-baremetal-tests/run-baremetal-benchmarks.sh b/scripts/lttng-baremetal-tests/run-baremetal-benchmarks.sh
index 0c722ae3a4d507dc20788e116fe6785558adffbc..9c64afd06b0dcc531d5cd2c5680b1e72d21a676f 100644 (file)
--- a/scripts/lttng-baremetal-tests/run-baremetal-benchmarks.sh
+++ b/scripts/lttng-baremetal-tests/run-baremetal-benchmarks.sh
@@ -16,9 +16,10 @@
 
 echo 'At this point, we built the modules and kernel if we needed to.'
 echo 'We can now launch the lava job using those artefacts'
 
 echo 'At this point, we built the modules and kernel if we needed to.'
 echo 'We can now launch the lava job using those artefacts'

-git clone https://github.com/lttng/lttng-ci

 
 

-python3 -u lttng-ci/scripts/lttng-baremetal-tests/lava-submit.py \
+git clone https://github.com/lttng/lttng-ci "$LTTNG_CI_PATH"
+
+python3 -u "$LTTNG_CI_PATH"/scripts/lttng-baremetal-tests/lava-submit.py \

                           -t baremetal-benchmarks \
                           -j "$JOB_NAME" \
                           -k "$STORAGE_KERNEL_IMAGE" \
                           -t baremetal-benchmarks \
                           -j "$JOB_NAME" \
                           -k "$STORAGE_KERNEL_IMAGE" \


@@ -30,12 +31,16 @@ python3 -u lttng-ci/scripts/lttng-baremetal-tests/lava-submit.py \
 RESULT_STORAGE_FOLDER="$BASE_STORAGE_FOLDER/benchmark-results/$JOB_NAME/$BUILD_NUMBER"
 $SSH_COMMAND "$STORAGE_USER@$STORAGE_HOST" mkdir -p "$RESULT_STORAGE_FOLDER"
 
 RESULT_STORAGE_FOLDER="$BASE_STORAGE_FOLDER/benchmark-results/$JOB_NAME/$BUILD_NUMBER"
 $SSH_COMMAND "$STORAGE_USER@$STORAGE_HOST" mkdir -p "$RESULT_STORAGE_FOLDER"
 

-# Create a metadata file for this job containing the build_id and the commit ids
-echo "build_id,kernel_commit,modules_commit,tools_commit" > metadata.csv
-echo "$BUILD_NUMBER,$KERNEL_COMMIT_ID,$LTTNG_MODULES_COMMIT_ID,$LTTNG_TOOLS_COMMIT_ID" >> metadata.csv
+# Create a metadata file for this job containing the build_id, timestamp and the commit ids
+TIMESTAMP=$(/bin/date --iso-8601=seconds)
+LTTNG_CI_COMMIT_ID="$(git --git-dir="$LTTNG_CI_PATH"/.git/ --work-tree="$LTTNG_CI_PATH" rev-parse --short HEAD)"
+
+echo "build_id,timestamp,kernel_commit,modules_commit,tools_commit,ci_commit" > metadata.csv
+echo "$BUILD_NUMBER,$TIMESTAMP,$KERNEL_COMMIT_ID,$LTTNG_MODULES_COMMIT_ID,$LTTNG_TOOLS_COMMIT_ID,$LTTNG_CI_COMMIT_ID" >> metadata.csv

 
 # Copy the result files for each benchmark and metadata on storage server
 $SCP_COMMAND ./processed_results_close.csv "$STORAGE_USER@$STORAGE_HOST:$RESULT_STORAGE_FOLDER/close.csv"
 $SCP_COMMAND ./processed_results_open_efault.csv "$STORAGE_USER@$STORAGE_HOST:$RESULT_STORAGE_FOLDER/open-efault.csv"
 
 # Copy the result files for each benchmark and metadata on storage server
 $SCP_COMMAND ./processed_results_close.csv "$STORAGE_USER@$STORAGE_HOST:$RESULT_STORAGE_FOLDER/close.csv"
 $SCP_COMMAND ./processed_results_open_efault.csv "$STORAGE_USER@$STORAGE_HOST:$RESULT_STORAGE_FOLDER/open-efault.csv"

-$SCP_COMMAND ./processed_results_open_enoent.csv "$STORAGE_USER@$STORAGE_HOST:$RESULT_STORAGE_FOLDER/open-enoent.csv"
+$SCP_COMMAND ./processed_results_dup_close.csv "$STORAGE_USER@$STORAGE_HOST:$RESULT_STORAGE_FOLDER/dup-close.csv"
+$SCP_COMMAND ./processed_results_lttng_test_filter.csv "$STORAGE_USER@$STORAGE_HOST:$RESULT_STORAGE_FOLDER/lttng-test-filter.csv"

 $SCP_COMMAND ./metadata.csv "$STORAGE_USER@$STORAGE_HOST:$RESULT_STORAGE_FOLDER/metadata.csv"
 $SCP_COMMAND ./metadata.csv "$STORAGE_USER@$STORAGE_HOST:$RESULT_STORAGE_FOLDER/metadata.csv"