X-Git-Url: http://git.lttng.org./?a=blobdiff_plain;f=scripts%2Fsystem-tests%2Fbuild-modules.sh;h=7ad25b9d1726be4c2c090b1e515cbbe24ec38507;hb=9fc19e2832a82f3bd4f999506bf7b19a0e34c856;hp=8bbeccc541b50f136110c1f4fcf2fd39e13349a5;hpb=6252703ba33efacb583f10df01b2454c5fde1d74;p=lttng-ci.git

diff --git a/scripts/system-tests/build-modules.sh b/scripts/system-tests/build-modules.sh
index 8bbeccc..7ad25b9 100644
--- a/scripts/system-tests/build-modules.sh
+++ b/scripts/system-tests/build-modules.sh
@@ -19,11 +19,17 @@ 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"
 
-tar -czf "$DEPLOYDIR/$BUILD_NAME.lttng.modules.tar.gz" -C "$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"
-$S3_COMMAND "$DEPLOYDIR/$BUILD_NAME.lttng.modules.tar.gz" "$S3_STORAGE_LTTNG_MODULES"
+$S3_COMMAND put "$DEPLOYDIR/$BUILD_NAME.lttng.modules.tar.gz" s3://"$S3_STORAGE_LTTNG_MODULES"