jjb: replace usage of `defaults` by `job-template`

[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 62636c64bf52020c1ee582ae7cffbde96a82565e..f289b7179fa0e1bfb77bba0fdef9b92c5ec4cd41 100644 (file)
--- a/scripts/system-tests/run-baremetal-tests.sh
+++ b/scripts/system-tests/run-baremetal-tests.sh
@@ -16,11 +16,27 @@
 
 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/lava2-submit.py \

                           -t baremetal-tests \
                           -j "$JOB_NAME" \
                           -t baremetal-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" \
+                          -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"
+
+set +eu
+deactivate
+set -eu
+rm -rf "$venv"