Merge pull request #10 from frdeso/fix_missing_files

[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 4e2a1ee8e6a5cd0659a7df4b8acb8c19a69c0821..0c722ae3a4d507dc20788e116fe6785558adffbc 100644 (file)
--- a/scripts/lttng-baremetal-tests/run-baremetal-benchmarks.sh
+++ b/scripts/lttng-baremetal-tests/run-baremetal-benchmarks.sh
@@ -18,12 +18,24 @@ 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
 
-set +x
-python lttng-ci/scripts/lttng-baremetal-tests/lava-submit.py \
+python3 -u lttng-ci/scripts/lttng-baremetal-tests/lava-submit.py \
                           -t baremetal-benchmarks \
                           -j "$JOB_NAME" \
-                          -l "$LAVA_FRDESO_TOKEN" \
                           -k "$STORAGE_KERNEL_IMAGE" \
                           -km "$STORAGE_LINUX_MODULES" \
                           -lm "$STORAGE_LTTNG_MODULES" \
                           -tc "$LTTNG_TOOLS_COMMIT_ID"
+
+# Create a results folder for this job
+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
+
+# 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 ./metadata.csv "$STORAGE_USER@$STORAGE_HOST:$RESULT_STORAGE_FOLDER/metadata.csv"