Fix: system-tests: missing space

[lttng-ci.git] / scripts / system-tests / build-modules.sh

diff --git a/scripts/system-tests/build-modules.sh b/scripts/system-tests/build-modules.sh
index 42c8b92a61db911ae8321641de713b06964d2302..7ad25b9d1726be4c2c090b1e515cbbe24ec38507 100644 (file)
--- a/scripts/system-tests/build-modules.sh
+++ b/scripts/system-tests/build-modules.sh
@@ -19,10 +19,16 @@ echo 'So we build them against the kernel'
 
 $SCP_COMMAND "$STORAGE_USER@$STORAGE_HOST:$STORAGE_KERNEL_MODULE_SYMVERS" "$LINUX_PATH/Module.symvers"
 
-KERNELDIR="$LINUX_PATH" make -j"$NPROC" --directory="$LTTNG_MODULES_PATH"
 
+KERNELDIR="$LINUX_PATH" make -j"$NPROC" --directory="$LTTNG_MODULES_PATH"
 KERNELDIR="$LINUX_PATH" make -j"$NPROC" --directory="$LTTNG_MODULES_PATH" modules_install INSTALL_MOD_PATH="$MODULES_INSTALL_FOLDER"
 
+# Extract the linux modules to MODULES_INSTALL_FOLDER.
+# The resulting tarball will contain both lttng-modules and linux modules needed
+# for testing
+$S3_COMMAND get "s3://$S3_STORAGE_LINUX_MODULES"
+tar -xvzf $(basename "$S3_STORAGE_LINUX_MODULES") -C "$MODULES_INSTALL_FOLDER"
+
 tar -czf "$DEPLOYDIR/$BUILD_NAME.lttng.modules.tar.gz" -C "$MODULES_INSTALL_FOLDER/" lib/
 
 $SCP_COMMAND "$DEPLOYDIR/$BUILD_NAME.lttng.modules.tar.gz" "$STORAGE_USER@$STORAGE_HOST:$STORAGE_LTTNG_MODULES"