Fix: do not specify os type in deploy action

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

diff --git a/scripts/system-tests/check-build-needs.sh b/scripts/system-tests/check-build-needs.sh
index 21acde43cc7a2f1f3fd3eec4ab688f4e784d4653..6ad7a8c10cd8a315bd19f7b39c75badd24962786 100644 (file)
--- a/scripts/system-tests/check-build-needs.sh
+++ b/scripts/system-tests/check-build-needs.sh
@@ -27,7 +27,7 @@ if [ $? -ne 0 ]; then
   NEED_MODULES_BUILD=1
 fi
 
-$S3_COMMAND info "$S3_STORAGE_KERNEL_IMAGE"
+$S3_COMMAND info "s3://$S3_STORAGE_KERNEL_IMAGE"
 if [ $? -ne 0 ]; then
   NEED_KERNEL_BUILD=1
   # We need to build the lttng modules if the kernel has changed.
@@ -39,7 +39,7 @@ if [ $? -ne 0 ]; then
   NEED_MODULES_BUILD=1
 fi
 
-$S3_COMMAND info "$S3_STORAGE_LTTNG_MODULES"
+$S3_COMMAND info "s3://$S3_STORAGE_LTTNG_MODULES"
 if [ $? -ne 0 ]; then
   NEED_MODULES_BUILD=1
 fi
@@ -49,6 +49,13 @@ set -e
 # We need to fetch the kernel source and lttng-modules to build either the
 # kernel or modules
 if [ $NEED_MODULES_BUILD -eq 1 ] || [ $NEED_KERNEL_BUILD -eq 1 ] ; then
+  mkdir -p "$LINUX_PATH"
+  pushd "$LINUX_PATH"
+  git init
+  git remote add origin "$KGITREPO"
+  git fetch --depth 1 origin "$KERNEL_COMMIT_ID"
+  git checkout FETCH_HEAD
+  popd
 
   cp src/lttng-ci/lava/kernel/vanilla/x86_64_server.config "$LINUX_PATH/.config"
   make --directory="$LINUX_PATH" olddefconfig
@@ -57,7 +64,8 @@ if [ $NEED_MODULES_BUILD -eq 1 ] || [ $NEED_KERNEL_BUILD -eq 1 ] ; then
     make --directory="$LINUX_PATH" kvmconfig
   fi
 
-  make --directory="$LINUX_PATH" modules_prepare
+  # Embed everything
+  make --directory="$LINUX_PATH" localyesconfig
 fi
 
 #We create files to specify what needs to be built for the subsequent build steps