Remove kernel module for babeltrace benchmark jobs

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

diff --git a/scripts/system-tests/run-baremetal-benchmarks.sh b/scripts/system-tests/run-baremetal-benchmarks.sh
index 5978e0b8ce64862dd76aa7b5b14a28f5514242c6..0313d3002a822c72233d7fd2596254ba78ebfe1e 100644 (file)
--- a/scripts/system-tests/run-baremetal-benchmarks.sh
+++ b/scripts/system-tests/run-baremetal-benchmarks.sh
@@ -16,13 +16,25 @@
 
 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'

-python3 -u "$LTTNG_CI_PATH"/scripts/system-tests/lava-submit.py \
+
+venv=$(mktemp -d)
+virtualenv -p python3 "$venv"
+set +eu
+source "${venv}/bin/activate"
+set -eu
+pip install pyyaml Jinja2
+
+python -u "$LTTNG_CI_PATH"/scripts/system-tests/lava2-submit.py \

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

-                          -k "$STORAGE_KERNEL_IMAGE" \
-                          -km "$STORAGE_LINUX_MODULES" \
-                          -lm "$STORAGE_LTTNG_MODULES" \
-                          -tc "$LTTNG_TOOLS_COMMIT_ID"
+                          -k "$S3_URL_KERNEL_IMAGE" \
+                          -lm "$S3_URL_LTTNG_MODULES" \
+                          -tc "$LTTNG_TOOLS_COMMIT_ID" \
+                          -id "$BUILD_TAG"
+set +eu
+deactivate
+set -eu
+rm -rf "$venv"

 
 # Create a results folder for this job
 RESULT_STORAGE_FOLDER="$BASE_STORAGE_FOLDER/benchmark-results/$JOB_NAME/$BUILD_NUMBER"
 
 # Create a results folder for this job
 RESULT_STORAGE_FOLDER="$BASE_STORAGE_FOLDER/benchmark-results/$JOB_NAME/$BUILD_NUMBER"