Fix: Missing build-id parameter

[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 05eb6933708b71fd7e96e8bf3fcbb837cf0d994c..2e35db82b18be42b5cebc87a6818877ddfdf9ac0 100644 (file)
--- a/scripts/system-tests/run-kvm-tests.sh
+++ b/scripts/system-tests/run-kvm-tests.sh
@@ -16,13 +16,34 @@
 
 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'

-git clone https://github.com/lttng/lttng-ci "$LTTNG_CI_PATH"

 
 

-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 kvm-tests \
+                          -j "$JOB_NAME" \
+                          -k "$S3_URL_KERNEL_IMAGE" \
+                          -lm "$S3_URL_LTTNG_MODULES" \
+                          -tc "$LTTNG_TOOLS_COMMIT_ID" \
+                          -uc "$LTTNG_UST_COMMIT_ID" \
+                          -id "$BUILD_TAG" \
+                          --debug
+
+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" \

-                          -km "$STORAGE_LINUX_MODULES" \

                           -lm "$STORAGE_LTTNG_MODULES" \
                           -tc "$LTTNG_TOOLS_COMMIT_ID" \
                           -lm "$STORAGE_LTTNG_MODULES" \
                           -tc "$LTTNG_TOOLS_COMMIT_ID" \

-                          -uc "$LTTNG_UST_COMMIT_ID"
+                          -uc "$LTTNG_UST_COMMIT_ID" \
+                          -id "$BUILD_TAG"
+
+set +eu
+deactivate
+set -eu
+rm -rf "$venv"