Fix: use lib folder directly for modules tarballs

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

diff --git a/scripts/system-tests/run-kvm-tests.sh b/scripts/system-tests/run-kvm-tests.sh
index da803917c7ab0bc30ba3d9e3dd4cbcf6ad06af74..2d8ad7fc0e456d667e6e42026b133c9b4ee0f3f7 100644 (file)
--- a/scripts/system-tests/run-kvm-tests.sh
+++ b/scripts/system-tests/run-kvm-tests.sh
@@ -16,7 +16,15 @@
 
 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/lava-submit.py \

                           -t kvm-tests \
                           -j "$JOB_NAME" \
                           -k "$STORAGE_KERNEL_IMAGE" \
                           -t kvm-tests \
                           -j "$JOB_NAME" \
                           -k "$STORAGE_KERNEL_IMAGE" \


@@ -25,11 +33,16 @@ python3 -u "$LTTNG_CI_PATH"/scripts/system-tests/lava-submit.py \
                           -tc "$LTTNG_TOOLS_COMMIT_ID" \
                           -uc "$LTTNG_UST_COMMIT_ID"
 
                           -tc "$LTTNG_TOOLS_COMMIT_ID" \
                           -uc "$LTTNG_UST_COMMIT_ID"
 

-python3 -u "$LTTNG_CI_PATH"/scripts/system-tests/lava2-submit.py \
+python -u "$LTTNG_CI_PATH"/scripts/system-tests/lava2-submit.py \

                           -t kvm-tests \
                           -j "$JOB_NAME" \
                           -k "$S3_URL_KERNEL_IMAGE" \
                           -km "$S3_URL_LINUX_MODULES" \
                           -lm "$S3_URL_LTTNG_MODULES" \
                           -tc "$LTTNG_TOOLS_COMMIT_ID" \
                           -t kvm-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"
+                          -uc "$LTTNG_UST_COMMIT_ID" \
+                          --debug
+set +eu
+deactivate
+set -eu
+rm -rf "$venv"