LAVA: run lava2 submit first for easier migration iteration

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

diff --git a/scripts/system-tests/run-baremetal-tests.sh b/scripts/system-tests/run-baremetal-tests.sh
index 62dcd51c1ea70bdc4648350ac3eda213de0643bf..34270a9616338da5dd36b6d1838e000789eef267 100644 (file)
--- a/scripts/system-tests/run-baremetal-tests.sh
+++ b/scripts/system-tests/run-baremetal-tests.sh
@@ -16,7 +16,26 @@
 
 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/lttng-baremetal-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-tests \
+                          -j "$JOB_NAME" \
+                          -k "$S3_URL_KERNEL_IMAGE" \
+                          -km "$S3_URL_LINUX_MODULES" \
+                          -lm "$S3_URL_LTTNG_MODULES" \
+                          -tc "$LTTNG_TOOLS_COMMIT_ID" \
+                          -uc "$LTTNG_UST_COMMIT_ID" \
+                          --debug
+
+python -u "$LTTNG_CI_PATH"/scripts/system-tests/lava-submit.py \
                           -t baremetal-tests \
                           -j "$JOB_NAME" \
                           -k "$STORAGE_KERNEL_IMAGE" \
@@ -24,3 +43,8 @@ python3 -u "$LTTNG_CI_PATH"/scripts/lttng-baremetal-tests/lava-submit.py \
                           -lm "$STORAGE_LTTNG_MODULES" \
                           -tc "$LTTNG_TOOLS_COMMIT_ID" \
                           -uc "$LTTNG_UST_COMMIT_ID"
+
+set +eu
+deactivate
+set -eu
+rm -rf "$venv"