From: Jonathan Rajotte <jonathan.rajotte-julien@efficios.com>
Date: Fri, 2 Nov 2018 18:44:28 +0000 (-0400)
Subject: Leave the s3:// protocol outside of variables for later conversion to http/s
X-Git-Url: http://git.lttng.org./?a=commitdiff_plain;h=6d5c3948343b342f4fee638c80308f4bcdc716e0;p=lttng-ci.git

Leave the s3:// protocol outside of variables for later conversion to http/s

Signed-off-by: Jonathan Rajotte <jonathan.rajotte-julien@efficios.com>
---

diff --git a/scripts/system-tests/build-kernel.sh b/scripts/system-tests/build-kernel.sh
index d8def1c..a365a66 100644
--- a/scripts/system-tests/build-kernel.sh
+++ b/scripts/system-tests/build-kernel.sh
@@ -30,7 +30,7 @@ $SCP_COMMAND "$DEPLOYDIR/$KERNEL_COMMIT_ID.config" "$STORAGE_USER@$STORAGE_HOST:
 $SCP_COMMAND "$DEPLOYDIR/$KERNEL_COMMIT_ID.linux.modules.tar.gz" "$STORAGE_USER@$STORAGE_HOST:$STORAGE_LINUX_MODULES"
 $SCP_COMMAND "$LINUX_PATH/Module.symvers" "$STORAGE_USER@$STORAGE_HOST:$STORAGE_KERNEL_MODULE_SYMVERS"
 
-$S3_COMMAND put "$DEPLOYDIR/$KERNEL_COMMIT_ID.bzImage" "$S3_STORAGE_KERNEL_IMAGE"
-$S3_COMMAND put "$DEPLOYDIR/$KERNEL_COMMIT_ID.config" "$S3_STORAGE_KERNEL_CONFIG"
-$S3_COMMAND put "$DEPLOYDIR/$KERNEL_COMMIT_ID.linux.modules.tar.gz" "$S3_STORAGE_LINUX_MODULES"
-$S3_COMMAND put "$LINUX_PATH/Module.symvers" "$S3_STORAGE_KERNEL_MODULE_SYMVERS"
+$S3_COMMAND put "$DEPLOYDIR/$KERNEL_COMMIT_ID.bzImage" s3://"$S3_STORAGE_KERNEL_IMAGE"
+$S3_COMMAND put "$DEPLOYDIR/$KERNEL_COMMIT_ID.config" s3://"$S3_STORAGE_KERNEL_CONFIG"
+$S3_COMMAND put "$DEPLOYDIR/$KERNEL_COMMIT_ID.linux.modules.tar.gz" s3://"$S3_STORAGE_LINUX_MODULES"
+$S3_COMMAND put "$LINUX_PATH/Module.symvers" s3://"$S3_STORAGE_KERNEL_MODULE_SYMVERS"
diff --git a/scripts/system-tests/build-modules.sh b/scripts/system-tests/build-modules.sh
index 8bbeccc..002eea7 100644
--- a/scripts/system-tests/build-modules.sh
+++ b/scripts/system-tests/build-modules.sh
@@ -26,4 +26,4 @@ KERNELDIR="$LINUX_PATH" make -j"$NPROC" --directory="$LTTNG_MODULES_PATH" module
 tar -czf "$DEPLOYDIR/$BUILD_NAME.lttng.modules.tar.gz" -C "$MODULES_INSTALL_FOLDER/" ./
 
 $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 "$DEPLOYDIR/$BUILD_NAME.lttng.modules.tar.gz" s3://"$S3_STORAGE_LTTNG_MODULES"
diff --git a/scripts/system-tests/check-build-needs.sh b/scripts/system-tests/check-build-needs.sh
index 21acde4..6602d39 100644
--- 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
diff --git a/scripts/system-tests/generate-properties-master.sh b/scripts/system-tests/generate-properties-master.sh
index 3665835..ffaec29 100644
--- a/scripts/system-tests/generate-properties-master.sh
+++ b/scripts/system-tests/generate-properties-master.sh
@@ -51,7 +51,7 @@ echo "STORAGE_KERNEL_IMAGE=$BASE_STORAGE_FOLDER/kernel/$KERNEL_COMMIT_ID.$BUILD_
 echo "STORAGE_LINUX_MODULES=$BASE_STORAGE_FOLDER/modules/linux/$KERNEL_COMMIT_ID.$BUILD_DEVICE.linux.modules.tar.gz" >> properties.txt
 echo "STORAGE_LTTNG_MODULES=$BASE_STORAGE_FOLDER/modules/lttng/$KERNEL_COMMIT_ID-$LTTNG_MODULES_COMMIT_ID.$BUILD_DEVICE.lttng.modules.tar.gz" >> properties.txt
 
-BASE_S3_STORAGE="s3://lava"
+BASE_S3_STORAGE="lava"
 
 echo "BASE_S3_STORAGE=$BASE_S3_STORAGE" >> properties.txt
 echo "S3_STORAGE_KERNEL_FOLDER=$BASE_S3_STORAGE/kernel/" >> properties.txt