X-Git-Url: http://git.lttng.org./?a=blobdiff_plain;f=scripts%2Fsystem-tests%2Frun-kvm-tests.sh;h=8b9722bbd2a978dc4ac8c3907d31302cc5c328ec;hb=6b35e57c434006884c10febcd85f8e77b66ae13d;hp=57f462dfd7f3ae70f8ae512b9c3f91901e8ab807;hpb=ceac45b01235d8603d43e5e071fe9a90bd4d8205;p=lttng-ci.git

diff --git a/scripts/system-tests/run-kvm-tests.sh b/scripts/system-tests/run-kvm-tests.sh
index 57f462d..8b9722b 100644
--- a/scripts/system-tests/run-kvm-tests.sh
+++ b/scripts/system-tests/run-kvm-tests.sh
@@ -19,25 +19,30 @@ echo 'We can now launch the lava job using those artefacts'
 
 venv=$(mktemp -d)
 virtualenv -p python3 "$venv"
+set +eu
 source "${venv}/bin/activate"
-pip install pyyaml
+set -eu
+pip install pyyaml Jinja2
 
-python -u "$LTTNG_CI_PATH"/scripts/system-tests/lava-submit.py \
+python -u "$LTTNG_CI_PATH"/scripts/system-tests/lava2-submit.py \
                           -t kvm-tests \
                           -j "$JOB_NAME" \
-                          -k "$STORAGE_KERNEL_IMAGE" \
-                          -km "$STORAGE_LINUX_MODULES" \
-                          -lm "$STORAGE_LTTNG_MODULES" \
+                          -k "$S3_URL_KERNEL_IMAGE" \
+                          -lm "$S3_URL_LTTNG_MODULES" \
                           -tc "$LTTNG_TOOLS_COMMIT_ID" \
-                          -uc "$LTTNG_UST_COMMIT_ID"
+                          -uc "$LTTNG_UST_COMMIT_ID" \
+                          -id "$BUILD_TAG" \
+                          --debug
 
-python -u "$LTTNG_CI_PATH"/scripts/system-tests/lava2-submit.py \
+python -u "$LTTNG_CI_PATH"/scripts/system-tests/lava-submit.py \
                           -t kvm-tests \
                           -j "$JOB_NAME" \
-                          -k "$S3_URL_KERNEL_IMAGE" \
-                          -km "$S3_URL_LINUX_MODULES" \
-                          -lm "$S3_URL_LTTNG_MODULES" \
+                          -k "$STORAGE_KERNEL_IMAGE" \
+                          -lm "$STORAGE_LTTNG_MODULES" \
                           -tc "$LTTNG_TOOLS_COMMIT_ID" \
                           -uc "$LTTNG_UST_COMMIT_ID"
+
+set +eu
 deactivate
+set -eu
 rm -rf "$venv"