lava: Switch default lava-server to lava-master-03

[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..e6ceac3046a378b85ee5fb815060e26f7d3570b8 100644 (file)
--- a/scripts/system-tests/run-kvm-tests.sh
+++ b/scripts/system-tests/run-kvm-tests.sh
@@ -16,20 +16,30 @@
 
 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 \
-                          -t kvm-tests \
-                          -j "$JOB_NAME" \
-                          -k "$STORAGE_KERNEL_IMAGE" \
-                          -km "$STORAGE_LINUX_MODULES" \
-                          -lm "$STORAGE_LTTNG_MODULES" \
-                          -tc "$LTTNG_TOOLS_COMMIT_ID" \
-                          -uc "$LTTNG_UST_COMMIT_ID"

 
 

-python3 -u "$LTTNG_CI_PATH"/scripts/system-tests/lava2-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 \
                           -t kvm-tests \

+                          -lv "$LTTNG_VERSION" \

                           -j "$JOB_NAME" \
                           -k "$S3_URL_KERNEL_IMAGE" \
                           -j "$JOB_NAME" \
                           -k "$S3_URL_KERNEL_IMAGE" \

-                          -km "$S3_URL_LINUX_MODULES" \

                           -lm "$S3_URL_LTTNG_MODULES" \
                           -lm "$S3_URL_LTTNG_MODULES" \

+                          -tu "$LTTNG_TOOLS_REPO" \
+                          -uu "$LTTNG_UST_REPO" \

                           -tc "$LTTNG_TOOLS_COMMIT_ID" \
                           -tc "$LTTNG_TOOLS_COMMIT_ID" \

-                          -uc "$LTTNG_UST_COMMIT_ID"
+                          -uc "$LTTNG_UST_COMMIT_ID" \
+                          -id "$BUILD_TAG" \
+                          -r "$ROOTFS_URL" \
+                          --ci-repo "$LTTNG_CI_REPO" \
+                          --ci-branch "$LTTNG_CI_BRANCH"
+
+set +eu
+deactivate
+set -eu
+rm -rf "$venv"