X-Git-Url: http://git.lttng.org./?a=blobdiff_plain;f=scripts%2Fsystem-tests%2Fbuild-modules.sh;h=e68124beef9716ec223171da6d4e1d931682b32c;hb=888b31ded3149effc47f3dbd2f0457c7b929a25e;hp=04a8c0fa5076bbe89ac1df4bae853c30eb235ae3;hpb=7fa8d866cf930200963aabfa012241ced3046e4a;p=lttng-ci.git

diff --git a/scripts/system-tests/build-modules.sh b/scripts/system-tests/build-modules.sh
index 04a8c0f..e68124b 100644
--- a/scripts/system-tests/build-modules.sh
+++ b/scripts/system-tests/build-modules.sh
@@ -19,10 +19,19 @@ echo 'So we build them against the kernel'
 
 $SCP_COMMAND "$STORAGE_USER@$STORAGE_HOST:$STORAGE_KERNEL_MODULE_SYMVERS" "$LINUX_PATH/Module.symvers"
 
+$S3_COMMAND get "s3://$S3_STORAGE_LINUX_MODULES/$KERNEL_COMMIT_ID.linux.modules.tar.gz"
+
+# Extract the linux modules to MODULES_INSTALL_FOLDER.
+# The resulting tarball will contain both lttng-modules and linux modules needed
+# for testing
+
+tar -xvzf $KERNEL_COMMIT_ID.linux.modules.tar.gz -C "$MODULES_INSTALL_FOLDER"
+
 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/" ./
+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 put "$DEPLOYDIR/$BUILD_NAME.lttng.modules.tar.gz" s3://"$S3_STORAGE_LTTNG_MODULES"